[Pkg-gnupg-commit] [gnupg2] 159/166: New upstream version 2.1.19

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Mar 16 22:33:18 UTC 2017


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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 5fea181b56aa34032299f09881d118d757f05f95
Merge: eab50bf 4a28c21
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Mar 5 02:38:28 2017 +0100

    New upstream version 2.1.19

 ChangeLog                                | 1228 ++++++++++++++++
 Makefile.am                              |    3 +-
 NEWS                                     |   50 +
 VERSION                                  |    2 +-
 agent/agent.h                            |   22 +-
 agent/cache.c                            |   27 +-
 agent/call-pinentry.c                    |  103 +-
 agent/call-scd.c                         |  159 ++-
 agent/command-ssh.c                      |  128 +-
 agent/command.c                          |   15 +-
 agent/divert-scd.c                       |  125 +-
 agent/findkey.c                          |   40 +-
 agent/genkey.c                           |    2 +-
 agent/gpg-agent.c                        |    2 +-
 agent/pkdecrypt.c                        |    2 +-
 agent/pksign.c                           |   19 +-
 agent/preset-passphrase.c                |    2 +-
 agent/protect.c                          |    2 +-
 build-aux/speedo.mk                      |   35 +-
 build-aux/speedo/w32/inst.nsi            |   19 +-
 common/Makefile.am                       |    4 +-
 common/argparse.c                        |    8 +-
 common/argparse.h                        |    4 +-
 common/asshelp.c                         |    2 +-
 common/dotlock.c                         |   10 +-
 common/dotlock.h                         |    4 +-
 common/dynload.h                         |    4 +-
 common/exechelp-w32.c                    |   12 +-
 common/exectool.c                        |    5 +
 common/homedir.c                         |    2 +-
 common/iobuf.c                           |    2 +-
 sm/base64.c => common/ksba-io-support.c  |  153 +-
 common/ksba-io-support.h                 |   66 +
 common/logging.c                         |   44 +-
 common/logging.h                         |    6 +-
 common/membuf.c                          |    2 +-
 common/mischelp.c                        |    4 +-
 common/mischelp.h                        |    4 +-
 common/name-value.c                      |    2 +-
 common/session-env.c                     |    2 +-
 common/sexp-parse.h                      |    2 +-
 common/sexputil.c                        |   65 +-
 common/simple-pwquery.c                  |    2 +-
 common/simple-pwquery.h                  |    2 +-
 common/status-codes.h                    |  136 +-
 common/status.h                          |    1 +
 common/stringhelp.c                      |    4 +-
 common/stringhelp.h                      |    4 +-
 common/strlist.c                         |    4 +-
 common/strlist.h                         |    4 +-
 common/sysutils.c                        |   11 +
 common/sysutils.h                        |    1 +
 common/t-stringhelp.c                    |    4 +-
 common/t-strlist.c                       |    4 +-
 common/t-support.h                       |    4 +-
 common/t-timestuff.c                     |    4 +-
 common/t-w32-reg.c                       |    4 +-
 common/ttyio.c                           |    2 +-
 common/types.h                           |    4 +-
 common/utf8conv.c                        |    6 +-
 common/utf8conv.h                        |    4 +-
 common/util.h                            |   10 +-
 common/w32-reg.c                         |    4 +-
 common/w32help.h                         |    4 +-
 common/yesno.c                           |    2 +-
 configure.ac                             |   80 +-
 dirmngr/ChangeLog-2011                   |    4 +-
 dirmngr/Makefile.am                      |    7 +-
 dirmngr/certcache.c                      |  597 ++++++--
 dirmngr/certcache.h                      |   32 +-
 dirmngr/crlcache.c                       |    6 +-
 dirmngr/crlfetch.c                       |   31 +-
 dirmngr/dirmngr.c                        |  101 +-
 dirmngr/dirmngr.h                        |   34 +-
 dirmngr/dns-stuff.c                      |   81 +-
 dirmngr/dns-stuff.h                      |    5 +
 dirmngr/http-ntbtls.c                    |  124 ++
 dirmngr/http.c                           |  433 +++---
 dirmngr/http.h                           |   17 +-
 dirmngr/ks-engine-finger.c               |    4 +-
 dirmngr/ks-engine-hkp.c                  |  207 ++-
 dirmngr/ks-engine-http.c                 |    8 +-
 dirmngr/ks-engine-ldap.c                 |    8 +-
 dirmngr/ldap.c                           |   22 +-
 dirmngr/loadswdb.c                       |    7 +
 dirmngr/misc.c                           |    2 +
 dirmngr/ocsp.c                           |    5 +-
 dirmngr/server.c                         |  166 ++-
 dirmngr/t-http.c                         |   84 +-
 dirmngr/validate.c                       |  235 +--
 dirmngr/validate.h                       |   43 +-
 doc/DETAILS                              |   12 +-
 doc/TRANSLATE                            |    2 +-
 doc/defsincdate                          |    2 +-
 doc/dirmngr.texi                         |   15 +-
 doc/gnupg-module-overview.pdf            |  Bin 315248 -> 62898 bytes
 doc/gnupg-module-overview.png            |  Bin 36868 -> 58876 bytes
 doc/gpg-agent.texi                       |    6 +-
 doc/gpg.texi                             |   44 +-
 doc/gpgsm.texi                           |    2 +-
 doc/gpgv.texi                            |    5 +
 doc/scdaemon.texi                        |    2 +-
 doc/whats-new-in-2.1.txt                 |    6 +-
 g10/armor.c                              |    2 +-
 g10/build-packet.c                       |    2 +-
 g10/call-agent.c                         |    2 +-
 g10/call-dirmngr.c                       |   26 +-
 g10/card-util.c                          |    2 +-
 g10/compress.c                           |    2 +-
 g10/cpr.c                                |    3 +
 g10/encrypt.c                            |    6 +-
 g10/export.c                             |   75 +-
 g10/getkey.c                             |    2 +-
 g10/gpg.c                                |   23 +-
 g10/gpgv.c                               |   44 +-
 g10/import.c                             |    2 +-
 g10/keydb.c                              |    2 +-
 g10/keyedit.c                            |    8 +-
 g10/keygen.c                             |  284 ++--
 g10/keyid.c                              |    2 +-
 g10/keylist.c                            |    5 +-
 g10/keyring.c                            |   24 +-
 g10/main.h                               |    6 +-
 g10/mainproc.c                           |    6 +-
 g10/misc.c                               |    2 +-
 g10/passphrase.c                         |    3 +
 g10/pkclist.c                            |    4 +-
 g10/pubkey-enc.c                         |   36 +-
 g10/revoke.c                             |    2 +-
 g10/rmd160.c                             |    2 +-
 g10/server.c                             |   19 +-
 g10/sign.c                               |   11 +-
 g10/tdbdump.c                            |   22 +-
 g10/test-stubs.c                         |    3 +-
 g10/tofu.c                               |  114 +-
 g10/trust.c                              |   32 +-
 g10/trustdb.c                            |   87 +-
 g10/trustdb.h                            |   10 +-
 g13/Makefile.am                          |    2 +-
 g13/g13-syshelp.h                        |    2 +-
 g13/server.c                             |    2 +-
 g13/sh-cmd.c                             |    2 +-
 kbx/keybox-blob.c                        |    4 +-
 m4/autobuild.m4                          |    2 +-
 m4/gettext.m4                            |    4 +-
 m4/intldir.m4                            |    4 +-
 m4/lcmessage.m4                          |    4 +-
 m4/nls.m4                                |    4 +-
 m4/po.m4                                 |    4 +-
 m4/progtest.m4                           |    4 +-
 po/POTFILES.in                           |    2 +-
 po/ca.po                                 | 1636 ++++++++++-----------
 po/cs.po                                 | 1644 ++++++++++-----------
 po/da.po                                 | 1640 ++++++++++-----------
 po/de.po                                 | 1646 ++++++++++-----------
 po/el.po                                 | 1636 ++++++++++-----------
 po/en at boldquot.po                        | 1640 ++++++++++-----------
 po/en at quot.po                            | 1640 ++++++++++-----------
 po/eo.po                                 | 1633 ++++++++++-----------
 po/es.po                                 | 1643 ++++++++++-----------
 po/et.po                                 | 1636 ++++++++++-----------
 po/fi.po                                 | 1636 ++++++++++-----------
 po/fr.po                                 | 1648 ++++++++++-----------
 po/gl.po                                 | 1636 ++++++++++-----------
 po/gnupg2.pot                            | 1630 ++++++++++-----------
 po/hu.po                                 | 1636 ++++++++++-----------
 po/id.po                                 | 1636 ++++++++++-----------
 po/it.po                                 | 1636 ++++++++++-----------
 po/ja.po                                 | 1648 ++++++++++-----------
 po/nb.po                                 | 1643 ++++++++++-----------
 po/pl.po                                 | 1652 ++++++++++-----------
 po/pt.po                                 | 1637 ++++++++++-----------
 po/ro.po                                 | 1641 ++++++++++-----------
 po/ru.po                                 | 2303 +++++++++++++++---------------
 po/sk.po                                 | 1636 ++++++++++-----------
 po/sv.po                                 | 1642 ++++++++++-----------
 po/tr.po                                 | 1645 ++++++++++-----------
 po/uk.po                                 | 2136 +++++++++++++--------------
 po/zh_CN.po                              | 1641 ++++++++++-----------
 po/zh_TW.po                              | 1643 ++++++++++-----------
 scd/apdu.c                               |   99 +-
 scd/apdu.h                               |    2 +-
 scd/app-common.h                         |    7 +-
 scd/app-dinsig.c                         |    2 +-
 scd/app-geldkarte.c                      |    2 +-
 scd/app-nks.c                            |    2 +-
 scd/app-openpgp.c                        |  235 ++-
 scd/app.c                                |  160 ++-
 scd/ccid-driver.c                        |  271 +++-
 scd/ccid-driver.h                        |    4 +-
 scd/command.c                            |   66 +-
 scd/scdaemon.c                           |  206 +--
 scd/scdaemon.h                           |    5 +-
 sm/Makefile.am                           |    1 -
 sm/call-dirmngr.c                        |    2 +-
 sm/certchain.c                           |    2 +-
 sm/certdump.c                            |    4 +-
 sm/certlist.c                            |    2 +-
 sm/certreqgen-ui.c                       |   24 +-
 sm/certreqgen.c                          |   12 +-
 sm/decrypt.c                             |   21 +-
 sm/encrypt.c                             |   11 +-
 sm/export.c                              |   28 +-
 sm/gpgsm.h                               |   18 +-
 sm/import.c                              |   13 +-
 sm/keydb.c                               |    2 +-
 sm/keylist.c                             |    2 +-
 sm/sign.c                                |   11 +-
 sm/verify.c                              |   21 +-
 tests/gpgme/gpgme-defs.scm               |    6 +-
 tests/gpgme/run-tests.scm                |    2 +-
 tests/gpgme/wrap.scm                     |    7 +-
 tests/gpgscm/Makefile.am                 |    3 +-
 tests/gpgscm/ffi.c                       |    9 +
 tests/gpgscm/ffi.scm                     |    3 +
 tests/gpgscm/init.scm                    |   10 +-
 tests/gpgscm/lib.scm                     |    2 +-
 tests/gpgscm/main.c                      |    2 +-
 tests/gpgscm/scheme-private.h            |   12 +-
 tests/gpgscm/scheme.c                    |  582 ++++----
 tests/gpgscm/time.scm                    |   42 +
 tests/gpgsm/verify.scm                   |    8 +-
 tests/openpgp/Makefile.am                |    9 +-
 tests/openpgp/defs.scm                   |   27 +-
 tests/openpgp/gpgconf.scm                |   48 +
 tests/openpgp/issue2929.scm              |   32 +
 tests/openpgp/issue2941.scm              |   34 +
 tests/openpgp/quick-key-manipulation.scm |   57 +-
 tests/openpgp/samplekeys/README          |    2 +
 tests/openpgp/ssh-import.scm             |   33 +-
 tests/openpgp/tofu.scm                   |   51 +-
 tests/openpgp/verify.scm                 |    3 +
 tools/gpg-connect-agent.c                |   22 +-
 tools/gpg-wks-client.c                   |   90 +-
 tools/gpg-wks-server.c                   |   27 +-
 tools/gpg-wks.h                          |    4 +
 tools/gpgconf-comp.c                     |  275 ++--
 tools/gpgconf.c                          |    2 +-
 tools/gpgparsemail.c                     |    2 +-
 tools/gpgtar.c                           |    4 +-
 tools/mail-signed-keys                   |    2 +-
 tools/mime-parser.c                      |   25 +
 tools/mime-parser.h                      |    2 +
 tools/symcryptrun.c                      |    4 +-
 tools/wks-receive.c                      |   49 +-
 245 files changed, 31274 insertions(+), 26143 deletions(-)

diff --cc ChangeLog
index 556ca71,8bd68a6..39317bb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20098 -1,16 +1,21326 @@@
 -No more ChangeLog files
 -========================
++2017-03-01  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.19.
++	+ commit 4a28c212b35739ce951bd41cfc6ef1a215846b2e
+ 
+ 
++	build: Add kludge for "make distcheck" in a release build.
++	+ commit 246b27921b5dc34f367d879402725784aaee2494
++	* configure.ac: New option --enable-gnupg-builddir-envvar.
++	(ENABLE_GNUPG_BUILDDIR_ENVVAR): New ac_define.
++	* common/homedir.c (gnupg_set_builddir_from_env): Consider
++	ENABLE_GNUPG_BUILDDIR_ENVVAR.
++	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Rename to ...
++	(AM_DISTCHECK_CONFIGURE_FLAGS): this to be future proof.  Add option
++	--enable-gnupg-builddir-envvar.
+ 
 -Local Variables:
 -buffer-read-only: t
 -mode: text
 -End:
++2017-03-01  Yuri Chornoivan  <yurchor at ukr.net>
++
++	po: Update Ukrainian translation.
++	+ commit c7f2a59833728e99e00449da2ddb10cf66693e7e
++
++
++2017-03-01  Ineiev  <ineiev at gnu.org>
++
++	po: Update Russian translation.
++	+ commit 280c724fe26bfd861ac74abc71e221795d8947f0
++
++
++2017-03-01  Werner Koch  <wk at gnupg.org>
++
++	gpg: Make --export-options work with --export-secret-keys.
++	+ commit 891ab23411b7f20ef37d8bde81d9857b083235df
++	* g10/export.c (export_seckeys): Add arg OPTIONS and pass it to
++	do_export.
++	(export_secsubkeys): Ditto.
++	* g10/gpg.c (main): Pass opt.export_options to export_seckeys and
++	export_secsubkeys
++
++	gpg: Allow creating keys using an existing ECC key.
++	+ commit 2bbdeb8ee87a6c7ec211be16391a11b7c6030bed
++	* common/sexputil.c (get_pk_algo_from_canon_sexp): Remove arg R_ALGO.
++	Change to return the algo id.  Reimplement using get_pk_algo_from_key.
++	* g10/keygen.c (check_keygrip): Adjust for change.
++	* sm/certreqgen-ui.c (check_keygrip): Ditto.
++
++2017-02-28  Werner Koch  <wk at gnupg.org>
++
++	gpg: Do not require a trustdb for decryption.
++	+ commit e182542e90cbeff4f2ac6c8d71061356d7cdcdea
++	* g10/trustdb.c (init_trustdb): Add and implement arg NO_CREATE.
++	Change to return an error code.  Change all callers to to pass False
++	for NO_CREATE.
++	(tdb_get_ownertrust): New arg NO_CREATE.  Call init_trustdb to test
++	for a non-existing trustdb.  Change all callers to to pass False for
++	NO_CREATE.
++	(tdb_get_min_ownertrust): Ditto.
++	* g10/trust.c (get_ownertrust_with_min): Add arg NO_CREATE.  Call
++	init_trustdb for a quick check.
++	(get_ownertrust_info): Add arg NO_CREATE.
++	(get_ownertrust_string): Ditto.
++	* g10/gpgv.c (get_ownertrust_info): Adjust stub.
++	* g10/test-stubs.c (get_ownertrust_info): Ditto.
++	* g10/mainproc.c (list_node): Call get_ownertrust_info with NO_CREATE
++	set.
++	* g10/pubkey-enc.c (get_it): Ditto.
++
++2017-02-28  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Improve parsing.
++	+ commit e4583ae14e52482ab390c102d071755f91ab211d
++	* tests/gpgscm/scheme.c (port_increment_current_line): Avoid creating
++	the same integer if the delta is zero.  This happens a lot during
++	parsing, and puts pressure on the memory allocator.
++
++	gpgscm: Fix calculating the line number.
++	+ commit 058c97f9fc485405246b1adfcc905c1891550652
++	* tests/gpgscm/scheme.c (opexe_5): Only increment the line number on
++	newlines.
++
++	gpg,tools: Make auto-key-retrieve configurable via gpgconf.
++	+ commit d379a0174cca595204b32da9a66c513a1304e6d0
++	* g10/gpg.c (gpgconf_list): Add 'auto-key-retrieve'.
++	* tools/gpgconf-comp.c (gc_options_gpg): Likewise.
++
++	tests: Improve support for gpgconf.
++	+ commit 41900175cf046dd9abe3d7a6805f6a403d68df15
++	* tests/openpgp/defs.scm: Improve high-level inteface to gpgconf.
++	* tests/openpgp/gpgconf.scm: Adapt.
++	* tests/openpgp/tofu.scm: Use it to select the trust model.
++
++	gpg,tools: Make trust-model configurable via gpgconf.
++	+ commit ebeccd73eb85f9027f0985d77dfe901266c6ddef
++	* g10/gpg.c (gpgconf_list): Add 'trust-model'.
++	* tools/gpgconf-comp.c (gc_options_gpg): Likewise.
++
++	gpgscm: Track source locations in every kind of ports.
++	+ commit 7cc57e2c63d0fa97569736419db5c76117e7685b
++	* tests/gpgscm/scheme-private.h (struct port): Move location
++	information out of the union.
++	* tests/gpgscm/scheme.c (mark): All ports need marking now.
++	(gc): Likewise all ports on the load stack.
++	(port_clear_location): Adapt accordingly.  Also, add an empty function
++	for !SHOW_ERROR_LINE.
++	(port_increment_current_line): Likewise.
++	(port_reset_current_line): Drop function in favor of...
++	(port_init_location): ... this new function.
++	(file_push): Simplify.
++	(file_pop): Likewise.
++	(port_rep_from_filename): Likewise.
++	(port_rep_from_file): Likewise.
++	(port_rep_from_string): Also initialize the location.
++	(port_rep_from_scratch): Likewise.
++	(port_close): Simplify and generalize.
++	(skipspace): Likewise.
++	(token): Likewise.
++	(_Error_1): Generalize.
++	(opexe_5): Likewise.
++	(scheme_deinit): Simplify and generalize.
++	(scheme_load_named_file): Likewise.
++	(scheme_load_string): Also initialize the location.
++
++2017-02-28  Werner Koch  <wk at gnupg.org>
++
++	gpgv,w32: Fix --status-fd.
++	+ commit 8a67dc4c4324b617b5a3fea51c59c674488544d6
++	* g10/gpgv.c (main): Use translate_sys2libc_fd_int for --status-fd.
++
++	w32: Make pipes really pollable.
++	+ commit 1192449207f41b26be8950b04df84a52c8a2a886
++	* common/exectool.c (gnupg_exec_tool_stream) [W32]: Use _get_osfhandle
++	to print the fd for the command line.
++	* common/exechelp-w32.c (create_pipe_and_estream): Use es_sysopen so
++	that the streams are actually pollable.
++
++2017-02-26  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	dirmngr: Avoid warnings during non-ntbtls build.
++	+ commit f5782e11a560fd590221042391254c810a42e45f
++	* dirmngr/t-http.c (my_http_tls_verify_cb): Avoid warnings when not
++	using ntbtls.
++
++	trustdb: Respect --quiet during --import-ownertrust.
++	+ commit ddf01a67d6388d988f1db50a06facb21c14d9426
++	* g10/tdbdump.c (import_ownertrust): If opt.quiet is set, do not send
++	log_info messages.
++
++2017-02-26  Manish Goregaokar  <manish at mozilla.com>
++
++	g10: fix typo.
++	+ commit 64ec21bebd3f136722e608649906b59c6add6947
++	I already have copyright assignment with the FSF for GDB. I don't
++	think I'll need to do the DCO thing.
++
++2017-02-24  Werner Koch  <wk at gnupg.org>
++
++	gpgv: New options --log-file and --debug.
++	+ commit 7af5d61c6e210210c777be9e6e87720dd4a055d9
++	* g10/gpgv.c (oLoggerFile, oDebug): New consts.
++	(opts): Add options --log-file and --debug.
++	(main): Implement options.
++
++2017-02-24  Andre Heinecke  <aheinecke at intevation.de>
++
++	speedo,w32: Fix gpg-wks-client installation.
++	+ commit 49b4a676148523b51beca3ae929e9d78ed7ba110
++	* build-aux/speedo/w32/inst.nsi: gpg-wks-client is an exe.
++
++2017-02-23  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Add new debug flag "extprog"
++	+ commit 22b69b9edfdf6e6172239cbd1075ffe29077d339
++	* dirmngr/dirmngr.h (DBG_EXTPROG_VALUE, DBG_EXTPROG): New macros.
++	* dirmngr/dirmngr.c (debug_flags): Add flag "extprog".
++	(handle_connections): Use a macro instead of -1 for an invalid socket.
++	* dirmngr/loadswdb.c (verify_status_cb): Debug the gpgv call.
++
++	wks: Make sure that the draft 2 request is correctly detected.
++	+ commit d30e17ac62dea8913b7f353971d546b6b1a09bd5
++	* tools/gpg-wks.h (WKS_DRAFT_VERSION): New.
++	* tools/wks-receive.c (new_part): Move test wks draft version to ...
++	(t2body): new callback.
++	(wks_receive): Register this callback.
++	* tools/gpg-wks-server.c (send_confirmation_request): Emit draft
++	version header.
++	(send_congratulation_message): Ditto.
++	* tools/gpg-wks-client.c (decrypt_stream_parm_s): New.
++	(decrypt_stream_status_cb): Check DECRYTPION_KEY status.
++	(decrypt_stream): Get infor from new callback.
++	(process_confirmation_request): New arg 'mainfpr'.  Check that it
++	matches the decryption key.
++	(read_confirmation_request): Check that the decryption key has been
++	generated by us.
++	(command_send): Use macro from draft version header.
++	(send_confirmation_response): Emit draft version header.
++
++	wks: New callback for the mime parser.
++	+ commit a2090250829fe8989be2afc8cf41ba2a022072fc
++	* tools/mime-parser.c (mime_parser_context_s): New field 't2body'.
++	(parse_message_cb): Call that callback.
++	(mime_parser_set_t2body): New.
++
++	gpg: Emit new status DECRYPTION_KEY.
++	+ commit effa80e0b5fd8cf9e31a984afe391c2406edee8b
++	* common/status.h (STATUS_DECRYPTION_KEY): New.
++	* g10/pubkey-enc.c (get_it): Emit that status.
++
++	dirmngr,w32: Make https with ntbtls work.
++	+ commit a42bf00b4edce789999aa3bdfce235cf726463ae
++	* dirmngr/http.c (simple_cookie_functions): New.
++	(send_request) [HTTP_USE_NTBTLS, W32]: Use es_fopencookie.
++	(cookie_read): Factor some code out to ...
++	(read_server): new.
++	(simple_cookie_read, simple_cookie_write) [W32]: New.
++
++2017-02-22  Werner Koch  <wk at gnupg.org>
++
++	scd,agent: Improve the OpenPGP PIN prompt texts.
++	+ commit f98c8cb013033c08e98ebedcc0e084fbd2a85b0c
++	* scd/app-openpgp.c (get_prompt_info): Change texts.
++	* agent/call-pinentry.c (struct entry_features): New.
++	(getinfo_features_cb): New.
++	(start_pinentry): Set new fucntion as status callback.
++	(build_cmd_setdesc): New.  Replace all snprintf for SETDESC by this
++	one.
++
++2017-02-22  Andre Heinecke  <aheinecke at intevation.de>
++
++	scd: Nitpicks on the improved card prompts.
++	+ commit 143ca039e1e81140ae520cc1025f8e25c01acc80
++	* src/app-openpgp.c (get_prompt_info): Change wording and order
++	slightly.
++
++2017-02-22  Werner Koch  <wk at gnupg.org>
++
++	scd: Improve the prompts for OpenPGP cards.
++	+ commit e3944f34e3220f96fb1be449eb6f3d7360bc2d0b
++	* scd/app-openpgp.c (get_disp_name): New.
++	(get_disp_serialno): New.
++	(get_prompt_info): New.
++	(build_enter_admin_pin_prompt): Rework the prompt texts.  Factor some
++	code out to ...
++	(get_remaining_tries): New.
++	(verify_a_chv): Print a remaining counter also for the standard PIN.
++	Rework the prompt texts.
++
++	* agent/divert-scd.c (ask_for_card): Pretty format an OpenPGP serial
++	no.
++
++	agent: Prepend the description to a PIN prompt.
++	+ commit 6488ffb767733a2cf92ca5ba3e61fc0c53e0f673
++	* agent/divert-scd.c (has_percent0A_suffix): New.
++	(getpin_cb): Prepend DESC_TEXT to the prompt.
++	* agent/findkey.c (modify_description): Rename to ...
++	(agent_modify_description): this.  MAke global.  Add kludge to remove
++	empty parentheses from the end.
++	(agent_key_from_file, agent_delete_key): Adjust for above change.
++	* agent/pksign.c (agent_pksign_do): Modify DESC_TEXT also when
++	diverting to a card.
++
++	agent: Prepare to pass an additional parameter to the getpin callback.
++	+ commit 78d875a0f83bc046279b951aea76cd74f3c44fd8
++	* agent/call-scd.c (writekey_parm_s, inq_needpin_s): Merge into ...
++	(inq_needpin_parm_s): new struct.  Add new field 'getpin_cb_desc'.
++	Change users to set all fields.
++	(inq_needpin): Pass GETPIN_CB_DESC to the GETPIN_CB.
++	(agent_card_pksign): Add arg 'desc_text' and change arg 'getpin_cb' to
++	take an additional arg 'desc_text'.
++	(agent_card_pkdecrypt): Ditto.
++	(agent_card_writekey): Change arg 'getpin_cb' to take an additional
++	arg 'desc_text'.
++	(agent_card_scd): Ditto.
++	* agent/divert-scd.c (getpin_cb): Add new arg 'desc_text'.
++	(divert_pksign): Add new arg 'desc_text' and pass is to
++	agent_card_pksign.
++	(divert_pkdecrypt): Add new arg 'desc_text' and pass is to
++	agent_card_pkdecrypt.
++	* agent/pkdecrypt.c (agent_pkdecrypt): Pass DESC_TEXT to
++	divert_pkdecrypt.
++	* agent/pksign.c (agent_pksign_do):  Pass DESC_TEXT to
++	divert_pksign.
++
++2017-02-22  NIIBE Yutaka  <gniibe at fsij.org>
++
++	tests: No spelling fix for test text.
++	+ commit ef424353f342f80ca6d18ede8b63c1b02215d105
++	* tests/openpgp/verify.scm (msg_ed25519_rshort): Revert the spelling
++	fix.
++
++2017-02-21  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Add special treatment for the standard hkps pool to ntbtls.
++	+ commit 831d014550863026dfefa774c961a21bd20c1e48
++	* dirmngr/validate.h (VALIDATE_FLAG_SYSTRUST): Remove
++	(VALIDATE_FLAG_EXTRATRUST): Remove
++	(VALIDATE_FLAG_TRUST_SYSTEM): New.
++	(VALIDATE_FLAG_TRUST_CONFIG): New.
++	(VALIDATE_FLAG_TRUST_HKP): New.
++	(VALIDATE_FLAG_TRUST_HKPSPOOL): New.
++	(VALIDATE_FLAG_MASK_TRUST): New.
++	* dirmngr/validate.c (check_header_constants): New.
++	(validate_cert_chain): Call new function.  Simplify call to
++	is_trusted_cert.
++	* dirmngr/crlcache.c (crl_parse_insert): Pass
++	VALIDATE_FLAG_TRUST_CONFIG to validate_cert_chain
++	* dirmngr/server.c (cmd_validate): Use VALDIATE_FLAG_TRUST_SYSTEM and
++	VALIDATE_FLAG_TRUST_CONFIG.
++	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Check provided TLS
++	context.  Set trustclass flags using the new VALIDATE_FLAG_TRUST
++	values.
++
++	* dirmngr/certcache.c (cert_cache_init): Load the standard pool
++	certificate prior to the --hkp-cacerts.
++
++	dirmngr: Load --hkp-cacert values into the certificate cache.
++	+ commit d1625a9a82b1e5d96bbbf2132c49c53108565ae1
++	* dirmngr/dirmngr.c (hkp_cacert_filenames): New var.
++	(parse_rereadable_options): Store filenames from --hkp-cacert in the
++	new var.
++	(main, dirmngr_sighup_action): Pass that var to cert_cache_init.
++	* dirmngr/certcache.c (cert_cache_init): Add arg 'hkp_cacert' and load
++	those certs.
++	(load_certs_from_file): Use autodetect so that PEM and DER encodings
++	are possible.
++
++	dirmngr: Load "sks-keyservers.netCA.pem" into the cache.
++	+ commit 9741aa24d9056b56cd5366ff5379bd8a3e6118df
++	* dirmngr/certcache.c (load_certs_from_file): Always build this
++	function.  Add args 'trustclasses' and 'no_error'.  Pass TRUSTCLASSES
++	to put_cert.
++	(load_certs_from_system): Pass CERTTRUST_CLASS_SYSTEM to
++	load_certs_from_file.
++	(cert_cache_init): Try to load "sks-keyservers.netCA.pem".  Don't make
++	function fail in an out-of-core condition.
++
++	dirmngr: Implement trust classes for the cert cache.
++	+ commit 50b9828eacc39c1ca75cb8313db896e4bdc8b270
++	* dirmngr/certcache.h (CERTTRUST_CLASS_SYSTEM): New.
++	(CERTTRUST_CLASS_CONFIG): New.
++	(CERTTRUST_CLASS_HKP): New.
++	(CERTTRUST_CLASS_HKPSPOOL): New.
++	* dirmngr/certcache.c (MAX_EXTRA_CACHED_CERTS): Rename to ...
++	(MAX_NONPERM_CACHED_CERTS): this.
++	(total_extra_certificates): Rename to ...
++	(total_nonperm_certificates): this.
++	(total_config_certificates): Remove.
++	(total_trusted_certificates): Remove.
++	(total_system_trusted_certificates): Remove.
++	(cert_item_s): Remove field 'flags'.  Add fields 'permanent' and
++	'trustclasses'.
++	(clean_cache_slot): Clear new fields.
++	(put_cert): Change for new cert_item_t structure.
++	(load_certs_from_dir): Rename arg 'are_trusted' to 'trustclass'
++	(load_certs_from_file): Use CERTTRUST_CLASS_ value for put_cert.
++	(load_certs_from_w32_store): Ditto.
++	(cert_cache_init): Ditto.
++	(cert_cache_print_stats): Rewrite.
++	(is_trusted_cert): Replace arg 'with_systrust' by 'trustclasses'.
++	Chnage the test.
++	* dirmngr/validate.c (allowed_ca): Pass CERTTRUST_CLASS_CONFIG to
++	is_trusted_cert.
++	(validate_cert_chain): Pass CERTTRUST_CLASS_ values to
++	is_trusted_cert.
++
++	dirmngr: New Assuan option "http-crl".
++	+ commit 493c142e582ff5ef1b5fdfcb9653715ef43e83e9
++	* dirmngr/dirmngr.h (server_control_s): New flag 'http_no_crl'.
++	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Set this flag.
++	* dirmngr/server.c (option_handler): New option "http-crl"
++	* dirmngr/http.h (HTTP_FLAG_NO_CRL): New flag.
++	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Consult this flag.
++	* dirmngr/ks-engine-hkp.c (send_request): Set flag depending on CTRL.
++	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++
++	* dirmngr/t-http.c (main): New option --no-crl.
++
++	dirmngr: Add a magic field to the http structs.
++	+ commit 39c745038181edd097e188434b3f9c971ed3987f
++	* dirmngr/http.c (HTTP_SESSION_MAGIC): New.
++	(http_session_s): New field 'magic'.
++	(HTTP_CONTEXT_MAGIC): New.
++	(http_context_s): New field 'magic'.
++	(my_ntbtls_verify_cb): Assert MAGIC.
++	(fp_onclose_notification): Ditto.
++	(session_unref): Ditto.  Reset MAGIC.
++	(http_session_new): Set MAGIC.
++	(http_open): Ditto.
++	(http_raw_connect): Ditto.
++	(http_close): Assert MAGIC.  Reset MAGIC.
++
++	* dirmngr/t-http.c (my_http_tls_verify_cb): MArk HTTP_FLAGS unused.
++
++2017-02-21  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10: Support primary key generation by keygrip.
++	+ commit 3fc69224b7b22ad1df1395ebcb21549384839cd1
++	* g10/keygen.c (para_name): Add pKEYGRIP.
++	(generate_keypair): Use pKEYGRIP for key generation.
++	(do_generate_keypair): Call do_create_from_keygrip with pKEYGRIP.
++
++2017-02-20  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Setup a log handler for ntbtls.
++	+ commit a022baa4a487eec769411255a64088450c4c8a49
++	* dirmngr/dirmngr.c (my_ntbtls_log_handler) [HTTP_USE_NTBTLS]: New.
++	(main) [HTTP_USE_NTBTLS]: Register log handler.
++
++	common: New function log_logv_with_prefix.
++	+ commit 3e9512e557d95c7dc36835365b127b25f6a5cdd9
++	* common/logging.c (do_logv): Add arg 'prefmt' and print it.  Chnage
++	call callers to pass NULL.
++	(log_logv_with_prefix): New.
++
++	dirmngr.c: Make http.c build without any TLS support.
++	+ commit e174893262d8de0f52faa8abe4fc0402719a35d8
++	* dirmngr/http.c (http_session_new): Remove used of tls_prority.
++
++	 dirmngr: Make t-http.c work again with gnutls - second try.
++	+ commit 81ea24b8637ac08e44e9e44816689413c2ae7e08
++	* dirmngr/t-http.c: Always include ksba.h.
++
++	dirmngr: Make t-http.c work again with gnutls.
++	+ commit f923873863fd863d71349f20f5568f80aecc020b
++	* dirmngr/Makefile.am (t_http_CFLAGS, t_http_LDADD): Add KSBA flags
++	and libs.
++
++2017-02-19  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: First take on ntbtls cert verification.
++	+ commit 64fffd0ce2a4fd9cba152cf07497b585410cc652
++	* dirmngr/http-ntbtls.c: New.
++	* dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
++	* dirmngr/dirmngr.h (SERVER_CONTROL_MAGIC): New.
++	(server_conrol_s): Add field 'magic',
++	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Set MAGIC.
++	(dirmngr_deinit_default_ctrl): Set MAGIC to deadbeef.
++	* dirmngr/http.c (my_ntbtls_verify_cb): New.
++	(http_session_new) [HTTP_USE_NTBTLS]: Remove all CA setting code.
++	(send_request) [HTTP_USE_NTBTLS]: Set the verify callback.  Do not call
++	the verify callback after the handshake.
++	* dirmngr/ks-engine-hkp.c (send_request): Pass
++	gnupg_http_tls_verify_cb to http_session_new.
++	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++
++	* dirmngr/t-http.c (my_http_tls_verify_cb): New.
++	(main): Rename option --gnutls-debug to --tls-debug.
++	(main) [HTTP_USE_NTBTLS]: Create a session.
++
++2017-02-18  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Add per-session verify callback to http.c.
++	+ commit a74902cccde539ee2bd216caec0da6eb54b67c1b
++	* dirmngr/http.h (http_verify_cb_t): New type.
++	* dirmngr/http.c (http_session_s): Add fields flags, verify_cb, and
++	verify_cb_value.
++	(http_session_new): Remove arg tls_priority.  Add args verify_cb and
++	verify-cb_value.  Store them in the session object.
++	(send_request): Use per-session verify callback.
++	(http_verify_server_credentials) [HTTP_USE_NTBTLS]: Return
++	GPG_ERR_NOT_IMPLEMENTED.
++	* dirmngr/ks-engine-hkp.c (send_request): Adjust for changed
++	http_session_new.
++	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++	* dirmngr/t-http.c (main): Ditto.
++
++	* dirmngr/server.c (do_get_cert_local): Replace xmalloc by malloc.
++
++2017-02-17  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Strip the default https port from the Host: header.
++	+ commit cd32ebd152a522e362469ab969d91f8d49f28a60
++	* dirmngr/http.c (send_request): Strip the default https port.
++
++	dirmngr: Add option --no-crl to the VALIDATE cmd.
++	+ commit f07811ee2c0a8044551e2ec063eda61cff7f6e39
++	* dirmngr/validate.h: Remove enums VALIDATE_MODE_*.
++	(VALIDATE_FLAG_SYSTRUST, VALIDATE_FLAG_EXTRATRUST)
++	(VALIDATE_FLAG_CRL, VALIDATE_FLAG_RECURSIVE)
++	(VALIDATE_FLAG_OCSP, VALIDATE_FLAG_TLS)
++	(VALIDATE_FLAG_NOCRLCHECK): New constants.
++	* dirmngr/validate.c (validate_cert_chain): Change arg 'mode' to
++	'flags'.  Change code accordingly.  Remove NO-CRL in TLS mode kludge.
++	* dirmngr/crlcache.c (crl_parse_insert): Change to use flag values for
++	the validate_cert_chain call.
++	* dirmngr/server.c (cmd_validate): Ditto.  Add new option --no-crl.
++
++	dirmngr: Add options --tls and --systrust to the VALIDATE cmd.
++	+ commit 070211eb990f5ea41271eba432b6a6b485cef7c7
++	* dirmngr/certcache.h (certlist_s, certlist_t): New.
++	* dirmngr/certcache.c (read_certlist_from_stream): New.
++	(release_certlist): New.
++	* dirmngr/server.c (MAX_CERTLIST_LENGTH): New.
++	(cmd_validate): Add options --tls and --systrust.  Implement them
++	using a kludge for now.
++	* dirmngr/validate.c (validate_cert_chain): Support systrust
++	checking.  Add kludge to disable the CRL checking for tls mode.
++
++	dirmngr: Remove use of hardcoded numbers in validate.
++	+ commit ed99af030d19305dd7cd41c41ac581306cb91fd5
++	* dirmngr/validate.c (enum cert_usage_modes): New.
++	(cert_usage_p): Change type of arg MODE.  Use enums instead of
++	hardwired values.  Use a switch instead of tricky bit tests.
++	(cert_use_cert_p, cert_use_ocsp_p, cert_use_crl_p): Adjust.
++
++	* dirmngr/validate.c (cert_usage_p): Rename to check_cert_usage.
++	(cert_use_cert_p): Rename to check_cert_use_cert.
++	(cert_use_ocsp_p): Rename to check_cert_use_ocsp.
++	(cert_use_crl_p): Rename to check_cert_use_crl.
++
++	* dirmngr/validate.h (VALIDATE_MODE_CERT_SYSTRUST): New.
++	(VALIDATE_MODE_TLS, VALIDATE_MODE_TLS_SYSTRUST): New.
++
++2017-02-17  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent: No cards is not an error.
++	+ commit dea4b3c742acbd195d6ab12b279b4dda315f2582
++	* agent/command-ssh.c (card_key_list): Care the case of no cards.
++
++	agent: Send back all public keys for available cards.
++	+ commit 3f4f64b6ac0d7160fd9e1301f95820894b219c3f
++	* agent/call-scd.c (card_cardlist_cb, agent_card_cardlist): New.
++	* agent/command-ssh.c (card_key_list): New.
++	(ssh_handler_request_identities): Call card_key_list and loop for the
++	list to send public keys for all available cards.
++
++2017-02-17  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Guard use of tagged expressions.
++	+ commit aab6ba0bb60528b9e816e430be51170cf39611b0
++	* tests/gpgscm/init.scm (vm-history-print): Check that the tag added
++	to expressions when parsing source files matches the expected format.
++	* tests/gpgscm/lib.scm (assert): Likewise.
++
++2017-02-17  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix RESET command handling (more).
++	+ commit 99d4dfe83661d05ef3a20ed04e6cec5647536738
++	* scd/app-common.h (struct app_ctx_s): Add reset_requested.
++	* scd/app.c (app_reset): Locking APP, set reset_requested.
++	(deallocate_app): Release the lock.
++	(release_application): Add LOCKED_ALREADY argument.
++	(scd_update_reader_status_file): Hold the lock when accessing APP.
++	When reset_requested is set, close the reader and deallocate APP.
++	* scd/command.c (open_card_with_request, cmd_restart): Follow the
++	change of release_application.
++	(send_client_notifications): Here it calls release_application holding
++	the lock.
++
++2017-02-16  Werner Koch  <wk at gnupg.org>
++
++	dirmngr,w32: Load all system provided certificates.
++	+ commit 7006352da773d82c47797bbf11e570ecafac6501
++	* dirmngr/certcache.c (CERTOPENSYSTEMSTORE) [W32]: New type.
++	(CERTENUMCERTIFICATESINSTORE) [W32]: New type.
++	(CERTCLOSESTORE) [W32]: New type.
++	(load_certs_from_file) [W32]: Do not build.
++	(load_certs_from_w32_store) [W32]: New.
++	(load_certs_from_system) [W32]: Call new function.
++
++	dirmngr: Load all system provided certificates.
++	+ commit 9a1a5ca0bc2cfb17ccf632de3e134b6d789c6855
++	* configure.ac: Add option --default-trust-store.
++	(DEFAULT_TRUST_STORE_FILE): New ac_define.
++	* dirmngr/certcache.c: Include ksba-io-support.h.
++	(total_trusted_certificates, total_system_trusted_certificates): New.
++	(put_cert): Manage the new counters.
++	(cert_cache_deinit): Reset them.
++	(cert_cache_print_stats): Print them.
++	(is_trusted_cert): Add arg WITH_SYSTRUST.  Change all callers to pass
++	false.
++	(load_certs_from_file): New.
++	(load_certs_from_system): New.
++	(cert_cache_init): Load system certificates.
++
++	common: Rename remaining symbols in ksba-io-support.
++	+ commit e1dfd862367cf91b66abe86bd73664409354bb14
++	* common/ksba-io-support.c (gpgsm_reader_eof_seen): Rename to ...
++	(gnupg_ksba_reader_eof_seen): this.  Change all callers.
++	(gpgsm_destroy_reader): Rename to ...
++	(gnupg_ksba_destroy_reader): this.  Change all callers.
++	(gpgsm_finish_writer): Rename to ...
++	(gnupg_ksba_finish_writer): this.  Change all callers.
++	(gpgsm_destroy_writer): Rename to ...
++	(gnupg_ksba_destroy_writer): this.  Change all callers.
++	* common/ksba-io-support.c (struct base64_context_s): Rename to ...
++	(gnupg_ksba_io_s): this.
++	* common/ksba-io-support.h (base64_context_s): Ditto.
++	(Base64Context): Rename this typedef to ...
++	(gnupg_ksba_io_t): this.  Change all users.
++
++	common: Remove gpgsm dependencies from ksba-io-support.
++	+ commit 28c31524be84f20b34573c78bd3a94a81e4b1d61
++	* common/ksba-io-support.c: Include ksba-io-support.h instead of
++	../sm/gpgsm.h.  Include util.h.
++	(writer_cb_parm_s): Remove const from 'pem_name'.
++	(gpgsm_destroy_writer): Free 'pem_name'.
++	(gpgsm_create_reader): Rename to ...
++	(gnupg_ksba_create_reader): this.  Replace args CTRL and
++	ALLOW_MULTI_PEM by a new arg FLAGS.  Change the code to evaluate
++	FLAGS.  Change all callers to pass the FLAGS.
++	(gpgsm_create_writer): Rename to ...
++	(gnupg_ksba_create_writer): this.  Replace arg CTRL by new arg FLAGS.
++	Add arg PEM_NAME.  Evaluate FLAGS.  Store a copy of PEM_NAME.  Change
++	all callers to pass the FLAGS and PEM_NAME.
++
++	common: Change license of ksba-io-support.c.
++	+ commit 919e76b407ac557b0f518ec03f3cc59e9e5740c9
++	* common/ksba-io-support.c: Change from GPLv3+ to LGPLv3+/GPLv2+.
++
++	sm,common: Move ksba reader and writer support to common/.
++	+ commit 04bfa6fe6597b8ffcec61cbcacdc7eb137444e80
++	* sm/base64.c: Rename to ...
++	* common/ksba-io-support.c: this.
++	* common/ksba-io-support.h: New.
++	* common/Makefile.am (common_sources): Add new files.
++	* sm/Makefile.am (gpgsm_SOURCES): Remove base64.c
++
++	dirmngr: Prepare certcache for forthcoming changes.
++	+ commit 5c4e67afd6385b48065de6a0f2dd0bfd936ab90b
++	* dirmngr/certcache.c (cert_item_s): Rename 'flags.loaded' to
++	'flags.config'.  Add 'flags.systrust'.
++	(total_loaded_certificates): Rename to total_config_certificates.
++	(put_cert): Rename args for clarity.  Set SYSTRUST flag.
++	(load_certs_from_dir): Make sure put_cert does not set the SYSTRUST
++	flag.
++
++	dirmngr: Replace stpcpy chains by strconcat.
++	+ commit aef60abe6a1772e18634984a94bd70f57d57ccdd
++	* dirmngr/certcache.c (find_cert_bysn): Use strconcat.
++	(find_cert_bysubject): Ditto.
++	* dirmngr/http.c (store_header): Ditto.
++	* dirmngr/ldap.c (make_url): Ditto.
++	* dirmngr/server.c (get_cert_local_ski): Ditto.
++	(do_get_cert_local): Use xstrconcat.
++
++2017-02-16  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Minor fixes to silence compiler warnings.
++	+ commit 7a666ccb44f43c4efbaa51c1ca16fc0b37c3399d
++	* scd/app.c (app_reset): Initialize ERR.
++	* scd/scdaemon.c (scd_kick_the_loop, handle_connections): Catch the
++	return value.
++
++2017-02-15  Werner Koch  <wk at gnupg.org>
++
++	libdns: Workaround for bracketed numerical addresses.
++	+ commit a3509e12b6626a585ce7da6ceed8cfddcba2460f
++	* dirmngr/dns-stuff.c (resolve_name_libdns): Work around an
++	incompatibility between the glibc resolver and libdns.
++
++	dirmngr: Do PTR lookups only for 'keyserver --hosttable'.
++	+ commit a75325faf163275674a91971e75f1018035ca348
++	* dirmngr/ks-engine-hkp.c (hostinfo_s): Remove fields v4addr and
++	v5addr and add fields iporname and iporname_valid.
++	(create_new_hostinfo): Clear them.
++	(add_host): Remove the code to set the v4addr and v6addr fields.
++	(ks_hkp_print_hosttable): Remove printing of the fields.  Compute the
++	iporname field and display it.
++	(ks_hkp_reload): Force re-computing of the iporname field in
++	ks_hkp_print_hosttable.
++
++	dirmngr: Avoid PTR lookup for hosts in a pool.
++	+ commit da2ba20868093e3054d18adc2b1bc56cb23e4ba7
++	* dirmngr/ks-engine-hkp.c (add_host): Don't to a PTR lookup for hosts
++	in a pool.
++
++2017-02-15  Justus Winter  <justus at g10code.com>
++
++	tests,build: Fix distcheck.
++	+ commit 2f7b6cb279ea0ee27364fbb2b12df47e76166a39
++	* tests/gpgscm/Makefile.am (EXTRA_DIST): Add 'time.scm'.
++
++	tests: Test and document other ways to create keys.
++	+ commit 90d383f1eb07fc823518dea10eb15ca390f5cf8e
++	* doc/gpg.texi: Clarify usage and expiration arguments for key
++	generation.
++	* tests/openpgp/quick-key-manipulation.scm: Test all variants.
++
++	tests: Check expiration times of created keys.
++	+ commit 127e1e532da4083ccd3c307555b6177fab16f408
++	* tests/gpgscm/ffi.c (do_get_time): New function.
++	(ffi_init): Expose new function.
++	* tests/gpgscm/ffi.scm (get-time): Document new function.
++	* tests/gpgscm/time.scm: New file.
++	* tests/openpgp/quick-key-manipulation.scm: Use the new facilities to
++	check the expiration times of created keys.
++	* tests/openpgp/tofu.scm: Use the new module.
++
++2017-02-15  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix RESET command handling.
++	+ commit e2792813a55e091c51be7b1b089a71beb6466f1d
++	* scd/app.c (release_application_internal): Remove.
++	(release_application): Merge release_application_internal.
++	(app_reset): Kick the loop and let close the reader.  Sleep is
++	required here to wait closing.
++	(scd_update_reader_status_file): When APP is no use, close it.
++
++2017-02-14  Werner Koch  <wk at gnupg.org>
++
++	gpg: Make --export-ssh-key work for the primary key.
++	+ commit b456e5be91dc064fc9509ea86edab113721ed299
++	* g10/export.c (export_ssh_key): Also check the primary key.
++
++2017-02-13  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Do a DNS lookup even if it is missing from nsswitch.conf.
++	+ commit dee026d761ae3d7594c3dbc5b3fa842df53cc189
++	* dirmngr/dns-stuff.c (libdns_init): Do not print error message for a
++	missing nsswitch.conf.  Make sure that tehre is a DNS entry.
++
++	gpgconf: No ENOENT warning with --change-options et al.
++	+ commit 30dac0486b6357e84fbe79c612eea940b654e4d1
++	* tools/gpgconf-comp.c (retrieve_options_from_program): Check ERRNO
++	before printing a warning.
++
++	gpg: Print a warning if no command has been given.
++	+ commit 810adfd47801fc01e45fb71af9f05c91f7890cdb
++	* g10/gpg.c (main): Print in the default case.
++
++2017-02-13  Justus Winter  <justus at g10code.com>
++
++	g13: Fix build on macOS.
++	+ commit f8ce31a7bf1ee85e5010b628a66e6f69486e5213
++	* g13/Makefile.am (t_common_ldadd): Add iconv.
++
++2017-02-13  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix use case of PC/SC.
++	+ commit da4c132cca2c6df81243c9660b7348268a848f88
++	* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
++	When CCID driver fails to open, try PC/SC if APP is nothing.
++	* scd/app.c (select_application): Supply arg if APP is nothing.
++
++2017-02-10  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix memory leak in the error case of signature creation.
++	+ commit 5996c7bf99f3a681393fd9589276399ebc956cff
++	* g10/sign.c (write_signature_packets): Free SIG.  Also replace
++	xcalloc by xtrycalloc.
++
++2017-02-08  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	common: Avoid warning about implicit declaration of gnupg_fd_valid.
++	+ commit 8810314e377a9cb6612150a57cf99260ed0bb9f6
++	* common/logging.c: Add #include "sysutils.h".
++
++2017-02-08  Justus Winter  <justus at g10code.com>
++
++	gpg,common: Make sure that all fd given are valid.
++	+ commit 6823ed46584e753de3aba48a00ab738ab009a860
++	* common/sysutils.c (gnupg_fd_valid): New function.
++	* common/sysutils.h (gnupg_fd_valid): New declaration.
++	* common/logging.c (log_set_file): Use the new function.
++	* g10/cpr.c (set_status_fd): Likewise.
++	* g10/gpg.c (main): Likewise.
++	* g10/keylist.c (read_sessionkey_from_fd): Likewise.
++	* g10/passphrase.c (set_attrib_fd): Likewise.
++	* tests/openpgp/Makefile.am (XTESTS): Add the new test.
++	* tests/openpgp/issue2941.scm: New file.
++
++2017-02-07  Justus Winter  <justus at g10code.com>
++
++	tests: Skip key types not supported by OpenSSH.
++	+ commit 56aa85f88f6b35fb03a2dc1a95882d49a74290e3
++	* tests/openpgp/ssh-import.scm (path): New variable.
++	(ssh,ssh-keygen,ssh-version,ssh-supports?): Likewise.
++
++2017-02-07  Werner Koch  <wk at gnupg.org>
++
++	wks: Add WKS-Phase headers to the server messages.
++	+ commit b30ac663cec82c89ca9a3e87e65b36d2552f1533
++	* tools/gpg-wks-server.c (send_confirmation_request): Add custom
++	header.
++	(send_congratulation_message): Ditto.
++
++2017-02-05  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	po: Manual updates of nl translation.
++	+ commit aa3f08794bfc809821e2fc30a09a5ae23925c645
++	* po/nl.po: Apply several minor manual cleanups to nl.po that were
++	previously applied to all the other localizations.
++
++	po: Copied missing nl.po translation from the 2.0 branch.
++	+ commit 8a9d4b55b09d04482b46055f0a60f01b86738df3
++	* po/nl.po: Copy from 2.0 branch.
++
++	gpg: Fix aliases --list-key, --list-sig, and --check-sig.
++	+ commit f31120a5aa40b6e4e89d41d1d5d34e0f7da173b4
++	* g10/gpg.c (opts): Define commands with ARGPARSE_c
++	instead of ARGPARSE_s_n.
++
++2017-02-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	doc: Clarify abbreviation of --help.
++	+ commit f2b276dffbe2435b17abf2b3c51684d3636f3f11
++	* doc/gpg.texi: clarify abbreviation of --help.
++
++2017-02-03  Werner Koch  <wk at gnupg.org>
++
++	agent: Tell pinentry the hostname the agent is running on.
++	+ commit 042fe711c76f6377cedb8f83a73ba386cee34bb7
++	* agent/call-pinentry.c [!W32]: Incluse utsname.h
++	(start_pinentry): Pass nodename to OPTION/owner.
++
++	agent: Tell the Pinentry the client's pid.
++	+ commit 309f464a5952c7d7504b875bf4853914b1242346
++	* configure.ac: Check for SO_PEERCRED et al.
++	* agent/agent.h (server_control_s): Add field 'client_pid'.
++	* agent/command.c (start_command_handler): Set CLIENT_PID.
++	* agent/command-ssh.c (get_client_pid): New.
++	(start_command_handler_ssh): Set CLIENT_PID.
++	* agent/call-pinentry.c (start_pinentry): Tell Pinentry the client-pid.
++
++	gpg: More diagnostics for a launched pinentry.
++	+ commit 7052a0d77cf8f3a445b252a809d29be445788625
++	* agent/call-pinentry.c (start_pinentry): Call getinfo/ttyinfo.
++	* g10/server.c (gpg_proxy_pinentry_notify): Simplify the output so
++	that we do not change the code when adding new fields to
++	PINENTRY_LAUNCHED.
++
++2017-02-02  Neal H. Walfield  <neal at g10code.com>
++
++	gpg: Don't assume that strtoul interprets "" as 0.
++	+ commit 407f5f9baea5591f148974240a87dfb43e5efef3
++	* g10/tofu.c (show_statistics): If there are not records, return 0
++	instead of NULL.
++
++	tests: Improve description of test.
++	+ commit 64be8e1e8607944687f3ae45ec64aa30bf4fdf6f
++	* tests/openpgp/issue2929.scm: Improve description of test.
++
++	Revert "Revert "tests: Add test demonstrating issue2929.""
++	+ commit e596b21f4b78dd27489e677699cc4ba648051b3f
++	This reverts commit 59048b0f1aa77313573a1004cd3a9f02692a7521.
++
++	gpg: Ensure TOFU bindings associated with UTKs are registered as usual.
++	+ commit 769272ba87f282a69e8d5f9bb27c86e6bec4496b
++	* g10/tofu.c (get_trust): Call get_policy before short-circuiting the
++	policy lookup for ultimately trusted keys to make sure the binding is
++	added to the bindings table, if necessary.
++
++	gpg: If there is a TOFU conflict, elide the too few message warning.
++	+ commit a08c781739e7561093f32b732c4991f2bd817ec2
++	* g10/tofu.c (tofu_get_validity): If there was a conflict, don't also
++	print out a warning about too few messages.
++
++	gpg: Only print out TOFU statistics for conflicts in interactive mode.
++	+ commit 027b81b35fe36692005b8dba22d9eb2db05e8c80
++	* g10/tofu.c (get_trust): Add arguments POLICYP and CONFLICT_SETP.  If
++	they are not NULL, return the policy and conflict set (if there is
++	one), respectively.  Update callers.  If MAY_ASK is FALSE, don't print
++	out the statistics.
++	(tofu_register_encryption): If there is a conflict and we haven't yet
++	printed the statistics about the conflicting bindings, do so now.
++	(tofu_get_validity): Likewise.
++
++	gpg: Add newline to output.
++	+ commit 74268180e5a3acc827f3a369f1fe5971f3bbe285
++	* g10/tofu.c (ask_about_binding): Add newline to output.
++
++	gpg: Remove period at end of warning.
++	+ commit 6f9d8a956b2ca0f5a0eb7acc656fc17af2f2de47
++	* g10/tofu.c (tofu_register_encryption): Remove period at end of
++	warning.
++
++2017-02-01  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: New option --no-use-tor and internal changes.
++	+ commit 7440119e729d3fdedda8a9b44b70f8959beea8d7
++	* dirmngr/dns-stuff.c (disable_dns_tormode): New.
++	* dirmngr/dirmngr.c (oNoUseTor): New const.
++	(opts): New option --no-use-tor.
++	(tor_mode): New var.
++	(parse_rereadable_options): Change to use TOR_MODE.
++	(dirmngr_use_tor): New.
++	(set_tor_mode): Call disable_dns_tormode.  Implement oNoUseTor.
++	* dirmngr/dirmngr.h (opt): Remove field 'use_tor'.  Replace all
++	references by a call to dirmngr_use_tor().
++	* dirmngr/server.c (cmd_getinfo): Distinguish between default and
++	enforced TOR_MODE.
++
++2017-02-01  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix regression tracking the connection count.
++	+ commit 8ddc9268f6aedef0e178b174b89245c33d8189dd
++	* scd/scdaemon.c (get_active_connection_count): New.
++	(start_connection_thread): Bump ACTIVE_CONNECTIONS up and down.
++	* scd/command.c (cmd_getinfo): Add subcommand "connections".
++
++2017-01-31  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Tune the hash tables.
++	+ commit 2e78aa6ff770849415f8eb71ca70c8886e9564c8
++	* tests/gpgscm/scheme.c (oblist_initial_value): Increase the size of
++	the hash table based on the number of symbols used after initializing
++	the interpreter.
++	(new_frame_in_env): Increase the size of the hash table based on the
++	number of variables in the global environement.
++
++	gpgscm: Optimize environment lookups and insertions.
++	+ commit b85d509a8f5c2e6200b8051ca1593c019abce90b
++	* tests/gpgscm/scheme.c (pointercmp): New function.
++	(new_slot_spec_in_env): Add and use slot for insertions.
++	(find_slot_spec_in_env): New variant of 'find_slot_in_env' that
++	returns the slot on failures.
++	(find_slot_in_env): Express using the new function.
++	(new_slot_in_env): Update callsite.
++	(opexe_0): Optimize lookup-or-insert.
++	(opexe_1): Likewise.
++	(scheme_define): Likewise.
++
++	gpgscm: Fix build with list environments.
++	+ commit 874424ee3cc795eae9972b6259a2cc4dcdbb868e
++	* tests/gpgscm/scheme.c (new_slot_spec_in_env): Provide preallocation
++	inforomation if USE_ALIST_ENV.
++
++	gpgscm: Optimize symbol lookups and insertions.
++	+ commit cea6d114b60deaecfbc2eb1aedbdfb7e6700922f
++	* tests/gpgscm/scheme.c (oblist_find_by_name): Keep the list of
++	symbols sorted, return the slot where a new symbol must be inserted on
++	lookup failures.
++	(oblist_add_by_name): Add the new symbol at the given slot.
++	(mk_symbol): Adjust callsite.
++	(gensym): Likewise.
++	(assign_syntax): Likewise.
++
++	gpgscm: Fix build with object list.
++	+ commit 8f0ecb16cbb3798ad18be5f05b826db2aa1aaa00
++	* tests/gpgscm/scheme.c (oblist_add_by_name): Provide preallocation
++	information if USE_OBJECT_LIST.
++
++	gpgscm: Remove unused functions.
++	+ commit 2076cdaf6b93bc73223819895cc7a67323d8cee7
++	* tests/gpgscm/scheme.c (check_cell_alloced): Remove function.
++	(check_range_alloced): Likewise.
++
++2017-01-31  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Require --allow-version-check even if --use-tor is used.
++	+ commit b0e8376e19072ec3c590273c69ab3e8e5edfdaca
++	* dirmngr/dirmngr.c (housekeeping_thread): Load swdb only if the
++	option is set.
++
++2017-01-31  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Remove --debug-disable-ticker option.
++	+ commit e17fa5c75d76af4d4684ee810cb446ecd5110560
++	* scd/scdaemon.c (ticker_disabled): Remove.
++	(handle_tick, need_tick): Remove.
++	(handle_connections): Don't check ticker_disabled.
++
++	scd: Fix SERIALNO for multiple devices.
++	+ commit f08d37af049bf1718b301644020658dd2bb07638
++	* scd/app.c (select_application): Fix the logic if periodical check is
++	needed.  If it is needed for newly found device(s), kick the loop.
++	(scd_update_reader_status_file): Return value if select(2) should be
++	called with timeout.
++	* scd/ccid-driver.c (ccid_require_get_status): Don't return 0 for
++	token with no interrupt transfer for now.
++	* scd/command.c (open_card_with_request): Fix scan by SERIALNO.
++	* scd/scdaemon.c (update_usb): Remove.
++	(handle_connections): Evaluate need_tick after handle_tick.
++
++2017-01-30  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Use a compact vector representation.
++	+ commit 49e2ae65e892f93be7f87cfaae3392b50a99e4b1
++	* tests/gpgscm/scheme-private.h (struct cell): Add a compact vector
++	representation.
++	* tests/gpgscm/scheme.c (vector_length): Use new representation.
++	(vector_size): New macro.
++	(get_vector_object): Use the new representation.
++	(fill_vector): Likewise.
++	(vector_elem): Likewise.
++	(set_vector_elem): Likewise.
++	(mark): Likewise.
++	(gc): Likewise.  Be careful not to confuse immediate values for type
++	flags.
++	(finalize_cell): Vectors now require finalization.
++
++	gpgscm: Provide framework for immediate values.
++	+ commit e343984fc50e87830905614dc87f83f810551ad1
++	* tests/gpgscm/scheme.c (IMMEDIATE_TAG): New macro.
++	({is,set,clr}_immediate): Likewise.
++	(enum scheme_types): Make type tags disjoint from immediate values.
++	(TYPE_BITS): We need one more bit now.
++	(ADJ,T_MASKTYPE): Compute values.
++
++	gpgscm: Fix setting the line of the first gc reservation.
++	+ commit d27a4435bd8c0f0971d51ddf454422fc77d48271
++	* tests/gpgscm/scheme.c (_gc_disable): Negate guard.
++
++	gpgscm: Introduce macro for the vector length.
++	+ commit 489edf84c9a9c2122cef1b4e678154521525b54a
++	* tests/gpgscm/scheme.c (vector_length): New macro.
++	(get_vector_object): Use the new macro.
++	(oblist_add_by_name): Likewise.
++	(oblist_find_by_name): Likewise.
++	(oblist_all_symbols): Likewise.
++	(mk_vector): Likewise.
++	(mark): Likewise.
++	(new_slot_spec_in_env): Likewise.
++	(find_slot_spec_in_env): Likewise.
++	(opexe_2): Likewise.
++	(opexe_5): Likewise.
++
++	Revert "tests: Add test demonstrating issue2929."
++	+ commit 59048b0f1aa77313573a1004cd3a9f02692a7521
++	This reverts commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072.
++
++2017-01-30  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix GetSlotStatus.
++	+ commit 2a025039c1817c7f75c35a898884849a8e5dc926
++	* scd/apdu.c (get_status_reader): Add ON_WIRE arg, here.
++	(ct_get_status, pcsc_get_status_direct, pcsc_get_status_wrapped)
++	(pcsc_get_status, get_status_ccid, my_rapdu_get_status): Likewise.
++	(reset_pcsc_reader_wrapped, open_pcsc_reader_wrapped): Follow the
++	change.
++	(apdu_get_status_internal): It's lower-level driver which judge
++	it's not needed.  Otherwise, it can't detect the removal.
++	* scd/ccid-driver.c (ccid_slot_status): After the POWERED_OFF check,
++	we can skip sending GetSlotStatus packet on wire, when no need.
++
++	scd: Don't send GET_STATUS packet if not needed.
++	+ commit 7c8eee4d396a751d41fd1ee1e1b87b851fca172a
++	* scd/apdu.c (apdu_get_status_internal): Add ON_WIRE arg.
++	(apdu_connect): Call apdu_get_status_internal with ON_WIRE enabled.
++	(apdu_get_status): For periodical check, call apdu_get_status_internal
++	with ON_WIRE disabled.
++
++	scd: Fix cancel INTERRUPT transfer.
++	+ commit 216afba0d99582d0fbae1d6e925f4ddb349d9de3
++	* scd/ccid-driver.c (do_close_reader): Don't lock events, but check the
++	return value of libusb_cancel_transfer.
++
++2017-01-27  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: More changes on watching removal of card/reader.
++	+ commit f3d9b2582bcaa1936b4fed5ec42a889b02df2f42
++	* scd/app-common.h (struct app_ctx_s): Rename field to
++	periodical_check_needed.
++	* scd/scdaemon.c (update_usb): Rename from update_fdset_for_usb.
++	Don't use libusb_get_pollfds any more.
++	(scd_kick_the_loop): New.
++	(need_tick): Follow the rename.
++	(handle_connections): No libusb event handling here.
++	* scd/app.c (app_new_register): Follow the change of rename.
++	(select_application, scd_update_reader_status_file): Likewise.
++	* scd/ccid-driver.c (ccid_usb_thread_is_alive): New.
++	(intr_cb): Call scd_kick_the_loop.
++	(ccid_usb_thread): New.  Thread to invoke INTERRUPT callback.
++	(ccid_open_usb_reader): Add thread invocation.
++	(ccid_require_get_status): Remove
++	LIBUSB_WORKS_EXPECTED_FOR_INTERRUPT_ENDP.
++	(do_close_reader): Carefully handle handle->transfer.
++	(get_escaped_usb_string): Insert npth_unprotect/npth_protect.
++	(do_close_reader, bulk_out, bulk_in, abort_cmd, ccid_slot_status)
++	(ccid_transceive, ccid_transceive_secure): Likewise.
++
++	scd: Fix release of transfer object.
++	+ commit f92fe33f11c44f14fd31682259fcd231e8fa9e75
++	* scd/ccid-driver.c (intr_cb): Handle LIBUSB_TRANSFER_CANCELLED.
++	(do_close_reader): When callback is active, call
++	libusb_cancel_transfer and wait callback is fired off.
++
++	scd: Improve watching USB device removal.
++	+ commit 25cc8575da9a9b8bf60c64c8059cb5f73cc52e1d
++	* scd/apdu.c(struct reader_table_s): Add require_get_status.
++	(apdu_connect): Change return value meaning.  Call apdu_reset here.
++	* scd/app.c (app_new_register): Add require_get_status.
++	(select_application): Use the return value of apdu_connect.
++	(scd_update_reader_status_file): Call update_fdset_for_usb with
++	checking all_have_intr_endp.
++	(app_list_start, app_list_finish): Remove.
++	* scd/ccid-driver.c (struct ccid_driver_s): Add transfer.
++	(intr_cb): Don't call libusb_transfer in this callback.
++	(ccid_require_get_status): New.
++	(do_close_reader): Call libusb_transfer here.
++	* scd/scdaemon.c (update_fdset_for_usb): Remove the first argument.
++
++	scd: Wake up the select when new USB scan.
++	+ commit 031e3fa7b9a6770a4de1a184555250feeba0d26f
++	* scd/scdaemon.c (update_fdset_for_usb): Wake up the select(2).
++	(handle_connections): Use a kind of "self-pipe" technique.
++
++2017-01-26  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Only submit apdu_get_status when needed.
++	+ commit 881dcdfd84ebad36bff20c895e629025bed9d94e
++	* scd/apdu.c (apdu_dev_list_finish): Return Boolean value if
++	all device support INTERRUPT transfer.
++	* scd/ccid-driver.c (ccid_dev_scan_finish): Likewise.
++	* scd/app.c (app_new_register): Fix initial value of card_status.
++	(select_application): Call update_fdset_for_usb.
++	(scd_update_reader_status_file): Ditto.
++	* scd/scdaemon.c (update_fdset_for_usb, need_tick): New.
++	(handle_connections): Call handle_tick when select returns.
++	Let select watch USB file descriptors, too.
++	Call libusb_handle_events_timeout_completed for INTERRUPT transfer.
++
++	scd: Fix APP reference counting.
++	+ commit 9b06633c811e8815c07d744f20b45405cb082367
++	* scd/app.c (scd_update_reader_status_file): Don't call another
++	release_application_internal.
++	* scd/command.c (open_card_with_request): Don't require APPTYPE !=
++	NULL.
++
++	scd: Add INTERRUPT endp support to CCID driver.
++	+ commit bb5ceb78c333129a44c0144f2cf49b17ede898f1
++	* scd/app.c (scd_update_reader_status_file): Fix releas of APP.
++	* scd/ccid-driver.c (struct ccid_driver_s): Add INTR_BUF.
++	(intr_cb, ccid_setup_intr): New.
++	(ccid_open_usb_reader): Call ccid_setup_intr.
++	(ccid_slot_status): Return CCID_DRIVER_ERR_NO_READER when removed.
++
++2017-01-25  Justus Winter  <justus at g10code.com>
++
++	gpg: Fix searching for mail addresses in keyrings.
++	+ commit 3f4f20ee6eff052c88647b820d9ecfdbd8df0f40
++	* g10/keyring.c (compare_name): Fix KEYDB_SEARCH_MODE_MAIL* searches
++	in keyrings when the UID is a plain addr-spec.
++
++	tests,w32: Fix GPGME tests requiring a pinentry.
++	+ commit 02a39f0d1ed717f6fc33392e6ce4ab421c3bcbba
++	* tests/gpgme/gpgme-defs.scm: Use our fake pinentry, and configure it
++	to supply the correct passphrase.
++
++	tests,w32: Fix gpgsm signature verification test.
++	+ commit 7d5a0ed792133d875fcedb6e23a9a3682f1a23f9
++	* tests/gpgsm/verify.scm: Use 'call-with-binary-output-file' to avoid
++	automatic line-ending conversion.
++
++	agent: Fix double free.
++	+ commit e175152ef7515921635bf1e00383e812668d13fc
++	* agent/cache.c (agent_store_cache_hit): Make sure the update is
++	atomic.
++
++	tests: Skip GPGME tests that are not built.
++	+ commit 5f2da5d439debf44615a97de788d8f720b517972
++	* tests/gpgme/wrap.scm: Skip tests that are not built.
++
++	tests,w32: Fix locating GPGME's tests on Windows.
++	+ commit 6ecd8b3e71632bbcca524ad735c83bdc2a4c4a4a
++	* tests/gpgme/run-tests.scm: Qualify the test with the executable
++	extension.
++
++2017-01-24  Werner Koch  <wk at gnupg.org>
++
++	gpg: Print a warning on Tor problems.
++	+ commit 770b75a746836773909af25ccb9b480e61cea677
++	* dirmngr/ks-engine-hkp.c (tor_not_running_p): New.
++	(map_host): Call that to print a warning.
++	(handle_send_request_error): Ditto and avoid marking the host dead.
++	Also print a tor_config_problem warning.  Add arg CTRL; adjust callers
++	to pass that new arg.
++	* g10/call-dirmngr.c (ks_status_cb): Detect and print the new
++	warnings.
++
++	dirmngr: Simplify error returning inside http.c.
++	+ commit 51e5a5e5a46279809848b4ab4419f35045336010
++	* dirmngr/http.c (connect_server): Change to return an gpg_error_t
++	and to store socket at the passed address.
++	(http_raw_connect, send_request): Adjust accordingly.
++
++	dirmngr: New option --disable-ipv4.
++	+ commit 72736af86a501592d974d46ff754a63959e183bd
++	* dirmngr/dirmngr.c (oDisableIPv4): New const.
++	(opts): New option --disable-ipv4.
++	(parse_rereadable_options): Set that option.
++	* dirmngr/dirmngr.h (opt): New field 'disable_ipv4'.
++	* dirmngr/dns-stuff.c (opt_disable_ipv4): bew var.
++	(set_dns_disable_ipv4): New.
++	(resolve_name_standard): Skip v4 addresses when OPT_DISABLE_IPV4 is
++	set.
++	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
++	(send_request): Pass HTTP_FLAG_IGNORE_IPv4 if opt.disable_v4 is set.
++	* dirmngr/crlfetch.c (crl_fetch): Ditto.
++	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Ditto.
++	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
++
++2017-01-24  Justus Winter  <justus at g10code.com>
++
++	tools: Use platform abstraction for I/O.
++	+ commit 73d6572bd0f260c5aa1e191a1ba4859ec6fa262c
++	* tools/gpg-connect-agent.c (main): Use a gpgrt_stream_t for
++	'script_fp'.  Adapt accordingly.
++
++	tools: Use platform abstraction for I/O.
++	+ commit 77b8aff4e1bb641f497e63230a5006ab70e6c3a8
++	* tools/gpgconf-comp.c (retrieve_options_from_file): Use a
++	gpgrt_stream_t for 'list_file'.  Adapt accordingly.
++	(copy_file): Likewise for 'src' and 'dst'.
++	(change_options_file): Likewise for 'src_file' and 'dest_file'.
++	(change_options_program): Likewise for 'src_file' and 'dest_file'.
++	(gc_process_gpgconf_conf): Likewise for 'config'.
++
++	tools: Use platform abstraction for renaming files.
++	+ commit bfd75e9492fc4edd86f4049a62304943a7b2a29a
++	* tools/gpgconf-comp.c (gc_component_change_options): Use
++	'gnupg_rename_file'.  Also, block signals across all renames in an
++	attempt to make the whole process atomic.
++
++	tools: Add comments explaining the functions parameters.
++	+ commit 82e309ad06884e54693f4856412984331febdda0
++	* tools/gpgconf-comp.c (change_options_file): Add comments explaining
++	the functions parameters.
++	(change_options_program): Likewise.
++
++	tools: Improve error handling.
++	+ commit b0348fdb26637b0bcbd68a96c1746a1613b309af
++	* tools/gpgconf-comp.c (gp_component_change_options): Improve error
++	handling when reading from stdin.
++
++	tools: Fix memory leak.
++	+ commit 5b28f025085b386e0ec49535d4cd3f875a414eb0
++	* tools/gpgconf-comp.c (change_options_file): Fix leak.
++
++	tests: Add test demonstrating issue2929.
++	+ commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/issue2929.scm: New file.
++
++	tests: Enable gpgconf test.
++	+ commit 628ff843466b42309f850b8d65b13cf5f586b81f
++	* tests/openpgp/Makefile.am (XTESTS): Re-add gpgconf.scm.
++
 +2017-01-23  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.18.
 +	+ commit f8289b1d28f501d2f37bf9ccb5e42f7fb27b4688
 +
 +
 +	build: Change make distcheck configure and temp. remove gpgconf.scm.
 +	+ commit 25e029823813e190a18b601af60efcb1fb3b84af
 +	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Also test gpgtar and
 +	wks-tools.  Disable ntbtls.
 +	* tests/openpgp/Makefile.am (XTESTS): Temporary remove gpgconf.scm.
 +
 +	Fix format string errors and some missing error case initialization.
 +	+ commit af5979a42b9468ffe0f3ac6de5a77d982c5cf8a0
 +	* common/logging.c (do_logv): Remove extra parentheses in comparison.
 +
 +	* dirmngr/dns-stuff.c (resolve_addr_libdns): Init RES so that
 +	dns_res_close is given a defined value in the error case.
 +
 +	* dirmngr/http.c (cookie_read, cookie_write) [HTTP_USE_NTBTLS]: Fix
 +	format string char.
 +
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Remove duplicate "const".
 +	* dirmngr/ks-engine-http.c (ks_http_help): Ditto.
 +	* dirmngr/ks-engine-kdns.c (ks_kdns_help): Ditto.
 +	* dirmngr/ks-engine-ldap.c (ks_ldap_help): Ditto.
 +
 +	* scd/app-p15.c (send_keypairinfo, do_getattr): Fix format string
 +	char.
 +	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Init PID for the
 +	error case.
 +	(scdaemon_runtime_change): Ditto.
 +	(dirmngr_runtime_change): Ditto.
 +
 +	* tools/gpgconf.c (query_swdb): Init VALUE_SIZE_UL.
 +
 +	dirmngr: On SIGHUP mark all keyservers alive.
 +	+ commit 3ca3da8fc4ef802b8cceec5fde398a07b4888848
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_reload): New.
 +	* dirmngr/dirmngr.c (dirmngr_sighup_action): Call it.
 +
 +2017-01-23  Gaetan Bisson  <bisson at archlinux.org>
 +
 +	libdns: Hack to skip negation term.
 +	+ commit d4c0187dd93163f12e9f953366adef81ecf526a6
 +	* dirmngr/dns.c (dns_nssconf_loadfile): Skip negation terms in
 +	nsswitch.conf parser.
 +
 +2017-01-23  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Print debug message only with --debug.
 +	+ commit 9ae0b81e4ff08712da642456d0164f81924a91e4
 +	* dirmngr/dns-stuff.c (libdns_init): Call log_debug only if opt_debug
 +	is set.
 +
 +2017-01-23  Phil Pennock  <gnupg-devel at spodhuis.org>
 +
 +	dirmngr: Handle missing nsswitch.conf.
 +	+ commit 88ade475c56ac3712d6bd6d41ae38e1421dcb320
 +	* dirmngr/dns-stuff.c (libdns_init): Fallback to files,dns.
 +
 +2017-01-23  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	gpg: Fix misleading log message when checking regexp.
 +	+ commit a85731ada2d361eacddc5ae92f80d34792dd4b5e
 +	* src/trustdb.c (check_regexp): Correctly print whether the
 +	regexp matched or not.
 +
 +2017-01-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New export and import options "backup" and "restore".
 +	+ commit 953d4ec6afd1b42feb7465ee57e48d72f033019a
 +	* g10/export.c (parse_export_options): Add "backup" and its alias
 +	"export-backup".
 +	(do_export_one_keyblock): Export ring trust packets in backup mode.
 +	* g10/import.c (parse_import_options): Add "restore" and its alias
 +	"import-restore".
 +	(read_block): Import ring trust packets.
 +
 +2017-01-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix INTERRUPT transfer.
 +	+ commit 21c9ebb908c2ad2e322e7a13e59e5880494c4d67
 +	* scd/ccid-driver.c (find_endpoint): Don't return Bulk endpoint as
 +	Interrupt endpoint.
 +	(ccid_poll): Call libusb_interrupt_transfer.
 +
 +2017-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	build: Print a commit id in the generated ChangeLog.
 +	+ commit e926f30a1cda75f6334b79c303b5134f0441a3dc
 +	* build-aux/gitlog-to-changelog: Print an extra line with the commit
 +	id.
 +
 +	common: Fix buffer copy code again.
 +	+ commit e031b3c16cfec583c4322c84d299b355f0849c77
 +	* common/exectool.c (my_error_from_errno): Remove.
 +	(copy_buffer_do_copy): Do without var RC.
 +	(copy_buffer_flush): Ditto.  Use ERRNO instead of es_write return
 +	code.
 +	(gnupg_exec_tool): Correctly return errors from es_read.
 +
 +2017-01-19  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	gpg: Allow to freeze faked system time.
 +	+ commit 3daeef702b2e6a42f0f396b828f86ffc3f33fc88
 +	* g10/gpg.c (main): If the parameter for --faked-system-time
 +	ends with a '!', freeze time at the specified point.
 +	* common/gettime.c (gnupg_set_time): Allow to freeze the time
 +	at an arbitrary time instead of only the current time.
 +	* doc/gpg.texi: Update documentation for --faked-system-time.
 +
 +2017-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	common: Clarify use of vars in buffer copy code.
 +	+ commit 55c9212a2338bf0b07c8cf3a69bcedaa28d48d43
 +	* common/exectool.c (my_error_from_errno): New.
 +	(copy_buffer_do_copy): Use separate vars for errno values and
 +	gpg-error values for clarity.  s/assert/log_assert/.
 +	(copy_buffer_flush): Ditto.
 +	(gnupg_exec_tool_stream): Use gpg_err_code when testing.
 +
 +2017-01-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: Add setup of CA for NTBTLS.
 +	+ commit 367349b4dcc97718f8ae1163d1389d2a46fc3453
 +	* dirmngr/http.c [HTTP_USE_NTBTLS] (http_session_new): Add CA by
 +	ntbtls_set_ca_chain.
 +
 +2017-01-18  Justus Winter  <justus at g10code.com>
 +
 +	common: Fix flushing copy buffers.
 +	+ commit 34fa2d79a07a079be472c3ff486debfdac8c6070
 +	* common/exectool.c (copy_buffer_flush): Write and flush the data, but
 +	do not hide EAGAIN from the caller.
 +	(gnupg_exec_tool_stream): Retry on EAGAIN.
 +
 +2017-01-18  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Reduce sleep time in the progress callback.
 +	+ commit 3d356d165aed7d76a3ea811b1d24ed0a05ac90d4
 +	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Reduce sleep time
 +	from 100ms to 1ms or use gpgrt_yield when build against a recent
 +	libgpg-error.
 +
 +	gpgconf: Allow "all" for --launch, --kill, and --reload.
 +	+ commit 2312248b2e3adffa52d8a3ac4f24fe2c88f0f569
 +	* tools/gpgconf-comp.c (gc_component_launch): Allow -1 for COMPONENT.
 +	(gc_component_kill): Ditto.
 +	(gc_component_reload): For robustness change the condition to < 0.
 +	* tools/gpgconf.c (main) <aLaunch, aKill, aReload>: Support argument
 +	"all".
 +
 +	gpg: Remove unused definitions.
 +	+ commit 701f54eccf3da3319dd6d74f46b852c64d90bc52
 +	* g10/keydb.h (rt_UNKNOWN, rt_RING): Remove constants.
 +	(keyblock_pos_struct, KBPOS): Remove struct and type.
 +
 +2017-01-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Cleanup SERIALNO protocol.
 +	+ commit 79cea89774e6327b6785e22b7057f9e3e188ac2b
 +	* scd/app.c (app_get_serial_and_stamp): Remove.
 +	(app_get_serialno): New.
 +	(app_write_learn_status): Use send_status_direct.
 +	(app_getattr): Use app_get_serialno for SERIALNO and
 +	send with send_status_direct.
 +	* scd/app-openpgp.c (do_getattr): Likewise.
 +	* scd/command.c (cmd_serialno): Don't send TIMESTAMP of 0.
 +	(cmd_learn): Likewise.  Don't inquire with TIMESTAMP of 0.
 +
 +	scd: Add "card_list" sub command for GETINFO.
 +	+ commit 8b1f24a29ebc7651437c01990215a55b1136dae0
 +	* scd/app.c (app_send_card_list): New.
 +	* scd/command.c (cmd_getinfo): Fix "status" sub command.
 +	Add "card_list" sub command.
 +
 +2017-01-17  Werner Koch  <wk at gnupg.org>
 +
 +	build: Handle packages with dashes in --find-version.
 +	+ commit a09f258b1412209763222e2e81bab79663e4d685
 +	* autogen.sh (--find-version): Improve version extraction.
 +	* (--help): Extend.
 +
 +	gpg: Clean bogus subkey binding when cleaning a key.
 +	+ commit 356323768a1a29138581d0aceed0336ab8be0d5c
 +	* g10/trust.c (clean_key): Also clean bogus subkey bindings.
 +
 +	gpg: Sync print of additional sig data in --edit-key.
 +	+ commit 766c25018b288a7185c6da6adac0dec01a64e94a
 +	* g10/keylist.c (show_policy_url): Implement MODE -1.
 +	(show_keyserver_url): Ditto.
 +	(show_notation): Ditto.
 +	* g10/keyedit.c (print_one_sig): Print policy URL, keyserver URL and
 +	notation data to the tty.
 +
 +	common: Remove unused function tty_print_string.
 +	+ commit bae42e543799a428e59bad870aed9719dd6e6e45
 +	* common/ttyio.c (tty_print_string): Rename to ...
 +	(do_print_string): this.  Make local.  Simplify FP case by using
 +	print_utf8_buffer.  Change caller.
 +
 +	gpg: Prepare some key cleaning function for use with secret key packets.
 +	+ commit adbfbf608e75cdd72ae7b3a538b91bc0e236a18f
 +	* g10/trust.c (mark_usable_uid_certs): Allow use of secret key packets.
 +	(clean_sigs_from_uid): Ditto.
 +	(clean_uid_from_key): Ditto.
 +	(clean_one_uid): Ditto.
 +	(clean_key): Ditto.
 +
 +2017-01-16  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Implement hkps lookups using literal addresses.
 +	+ commit e6aebfe3d0f16c483296fd125b66a44017fe15f4
 +	* dirmngr/ks-engine-hkp.c (map_host): For literal addresses do a
 +	reverse lookup.
 +
 +	dirmngr: Allow reverse DNS lookups in Tor-mode.
 +	+ commit 9850124c7bdf0a0e7c1866abc85f3437257d7095
 +	* dirmngr/dns-stuff.c (resolve_dns_name): Move up in the file.
 +	(resolve_addr_libdns): New.
 +	(resolve_dns_addr): Divert to resolve_dns_addr.
 +
 +	dirmngr: Avoid network queries for literal IP addresses.
 +	+ commit daae97bc14742c75408c4eb05808a2102cfe2bcf
 +	* dirmngr/dns-stuff.c (resolve_name_libdns): USe flags AI_NUMERICHOST
 +	for literal IP addresses.
 +	(resolve_name_standard): Ditto.
 +
 +	dirmngr: Fix URL creation for literal IPv6 addresses in HKP.
 +	+ commit 82646bbf1a5a7d745da81b239a12667a51703dc1
 +	* dirmngr/dns-stuff.c (is_ip_address): Make the return value depend on
 +	the address family.
 +	* dirmngr/ks-engine-hkp.c (map_host): Rename arg R_POOLNAME to
 +	R_HTTPHOST because that is its purpose.  Note that the former
 +	behaviour of storing a NULL to indicate that it is not a pool has not
 +	been used.
 +	(make_host_part): Ditto.
 +	(make_host_part): Make sure that literal v6 addresses are correclty
 +	marked in the constructed URL.
 +
 +2017-01-16  Justus Winter  <justus at g10code.com>
 +
 +	tests: Improve GPGHOME handling.
 +	+ commit 8b1611a9605b636db3e07a9d81016a11b318724c
 +	* tests/openpgp/defs.scm (GPGHOME): New variable.
 +	* tests/openpgp/ssh-import.scm: Remove redundant code, use 'path-join'.
 +	* tests/openpgp/tofu.scm: Likewise.
 +
 +2017-01-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Ask specific SERIALNO for pksign/pkdecrypt.
 +	+ commit 0801f49b0dc7102943f0e9fa51061f50f5708ca6
 +	* agent/call-scd.c (agent_card_serialno): Add DEMAND argument.
 +	* agent/command-ssh.c (card_key_available): Follow the change.
 +	* agent/learncard.c (agent_handle_learn): Likewise.
 +	* agent/divert-scd.c (ask_for_card): Use DEMAND argument.
 +
 +	scd: Add --demand option for SERIALNO.
 +	+ commit 2e6f1c99d4f66a23a752092397e20a84964edf48
 +	* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
 +	arguments.  Return matched APP with a serial number when specified.
 +	* scd/command.c (open_card): Modify for the implicit open only.
 +	(open_card_with_request): New for explicit open and support match with a
 +	serial number.
 +	(cmd_serialno): Support --demand option.
 +	(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
 +	(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
 +	(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
 +	the change of open_card.
 +
 +2017-01-12  Werner Koch  <wk at gnupg.org>
 +
 +	build: Make autogen.sh more POSIX friendly (next try)
 +	+ commit 3db76c9277d918dec9721a6439f4db3b3c06aba3
 +	* autogen.sh: Fix dd count to 5.
 +
 +	gpg: Rename a var to avoid a shadowing warning.
 +	+ commit c99a09f111c5980ae034faaea61a00d9ad60463c
 +	* g10/keygen.c (keygen_set_std_prefs): Rename variable.
 +
 +	tests: Fix t-gettime for a time_t of 64 and a long of 32 bit.
 +	+ commit 5c0777e1ca02ff1767755c417b64d6f78e02f475
 +	* configure.ac (AC_CHECK_HEADERS): Add stdint.h.
 +	* common/t-gettime.c: Include stdint.h.
 +	(UINTMAX_C): Define replacement.
 +	(test_isotime2epoch): Use UINTMAX_C for the >32 bit constants.
 +
 +	build: Make autogen.sh more POSIX friendly.
 +	+ commit 3c00b52f7cb0fbd756c0bbe5134b8f2d69c60dd1
 +	* autogen.sh: Replace non POSIX "cp -a" and "head -c".
 +
 +	libdns: Silence -Wstrict-prototypes on some function ptrs.
 +	+ commit 97372b39cd9b4c84a083eadbf072fff77799617f
 +	* dirmngr/dns.c (dns_rrtype): Ignore -Wstrict-prototypes warning.
 +
 +	libdns: Provide replacement for EPROTO.
 +	+ commit 0fadff9cdde47e42f7e428bc903b3626c67ba9c0
 +	* dirmngr/dns.c (EPROTO) ![EPROTO]: Define to EPROTONOSUPPORT.
 +
 +2017-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: After a connection failure log a hint if Tor is not running.
 +	+ commit 20dfcfe08c618d23134d5d6efef7676b090f30d3
 +	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Check whether
 +	Tor is running.
 +
 +	dirmngr: Mark hosts dead on ENETDOWN.
 +	+ commit 76fb2febde10da8237bbe7613830b51af2a45139
 +	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Take care of
 +	ENETDOWN.
 +
 +	dirmngr: Fix Tor access for v6 addresses.
 +	+ commit 09aeac41c97bc8ecb44a09886c7fdbd9a6ec5c7f
 +	* dirmngr/http.c (use_socks): New.
 +	(my_sock_new_for_addr): New.
 +	(connect_server): Replace assuan_sock_new by my_sock_new_for_addr.
 +
 +	dirmngr: Remove warnings about unused global variables.
 +	+ commit 915864e7f0315b0c96315d0bcd48b1b93592353a
 +	* dirmngr/crlcache.c (oidstr_issuingDistributionPoint): Comment.
 +	* dirmngr/ocsp.c (oidstr_certHash): Comment.
 +
 +	dirmngr: Implement debug option "network" for http.
 +	+ commit da894c48ec3393e7c815f575daa5a52ab37cc102
 +	* dirmngr/dirmngr.c (parse_rereadable_options): Set http debugging.
 +
 +	dirmngr: Add debug code to http.c.
 +	+ commit 02ab4b0085f8b4cdfe163d25ddd0fc80753d7f4a
 +	* dirmngr/http.c (opt_verbose, opt_debug): New vars.
 +	(http_set_verbose): New function.
 +	(_my_socket_new): Add debug output.
 +	(_my_socket_ref, _my_socket_unref, session_unref): Call log_debug if
 +	OPT_DEBUG has ben set to 2 in a debugger.
 +	(http_session_new, http_session_ref): Ditto.
 +	(send_request, http_start_data): Print debug output for the request.
 +	(parse_response): Change to use log_debug_string for the response.
 +
 +	common: New function log_debug_with_string.
 +	+ commit 088d71d3671e74eb088386026f0e439a7e3b5543
 +	* common/logging.c (do_logv): Factor some code out to ...
 +	(print_prefix): new.
 +	(log_logv): Add arg EXTRASTRING and print it.  Change all callers to
 +	pass NULL for it.
 +	(log_debug_with_string): New.  Uses EXTRASTRING.
 +
 +2017-01-11  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	common: Avoid unnecessary ambiguity in argparse.
 +	+ commit 7249ab0f95d1f6cb8ee61eefedc79801bb56398f
 +	* common/argparse.c (find_long_option): Avoid unnecessary ambiguity.
 +
 +2017-01-10  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	systemd-user: Enable "systemctl --user reload {dirmngr,gpg-agent}"
 +	+ commit a20a450ac4ef10847fd59a5fd3acbbd2bfcaa6a2
 +	* doc/examples/systemd-user/*.service: Add ExecReload directives to
 +	  indicate the canonical way to reload the services.
 +
 +	GnuPG recommends reloading the agent and dirmngr with "gpgconf
 +	--reload".  if anyone is running them as systemd user services, they
 +	might ask them to reload in the systemd way, so teach systemd the
 +	right thing to do.
 +
 +2017-01-10  Justus Winter  <justus at g10code.com>
 +
 +	tests: Improve gpgconf test.
 +	+ commit 88e42ef08d65d4d1bc29c6cea48df19ca0d5e2bd
 +	* tests/openpgp/defs.scm (valgrind): New variable.
 +	(gpg-config): Fix clearing an option.
 +	* tests/openpgp/gpgconf.scm: Also toggle 'quiet'.
 +
 +	tools: Fix memory leaks and improve error handling.
 +	+ commit 1f5caf90bfaaaf7b9d8c06c12087aeeae3748032
 +	* tools/gpgconf-comp.c (gc_option_free): New function.
 +	(gc_components_free): Likewise.
 +	(gc_components_init): Likewise.
 +	(retrieve_options_from_program): Use 'xfree', fix memory leak.
 +	(change_options_program): Improve error handling.
 +	(gc_component_change_options): Fix memory leaks.
 +	* tools/gpgconf.c (main): Initialize components.
 +	* tools/gpgconf.h (gc_components_init): New prototype.
 +
 +	tests: Add test for gpgconf.
 +	+ commit c8cfc62125aceee0ca48aab5c8a9fea1ec1ef652
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/defs.scm (percent-encode): New function.
 +	(gpg-conf): Generalize so that we can feed stdin.
 +	(gpg-config): New function.
 +	* tests/openpgp/gpgconf.scm: New file.
 +
 +	common: Fix fallback code.
 +	+ commit bfd6a490129ffc7c7ac8776bf5a5da3b1ddf6d42
 +	* common/logging.c (_log_assert): Fix the variant for compilers that
 +	do not support __FUNCTION__.
 +	* common/logging.h (_log_assert): Likewise.
 +
 +2017-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Use "pgpkey-hkps" and "pgpkey-hkp" for SRV record lookups.
 +	+ commit 0cc975d8a1cd54115938202432e43263b8893ea4
 +	* dirmngr/ks-engine-hkp.c (map_host): Chnage arg NO_SRV to SRVTAG.
 +	(make_host_part): Rewrite.
 +
 +	dirmngr: Do not use a SRV record for HKP if a port was specified.
 +	+ commit c2cbe2f87c480c62239dc4c2cbb352acd98cd267
 +	* dirmngr/http.h (parsed_uri_s): Add field EXPLICIT_PORT.
 +	* dirmngr/http.c (do_parse_uri): That it.
 +	* dirmngr/ks-engine-hkp.c (map_host): Add arg NO_SRV.
 +	(make_host_part): Ditto.
 +	(ks_hkp_resolve): Set NO_SRV from EXPLICIT_PORT.
 +	(ks_hkp_search): Ditto.
 +	(ks_hkp_get): Ditto.
 +	(ks_hkp_put): Ditto.
 +
 +2017-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Implement experimental SRV record lookup for WKD.
 +	+ commit 88dc3af3d4ae1afe1d5e136bc4c38bc4e7d4cd10
 +	* dirmngr/server.c (cmd_wkd_get): Support SRV records.
 +
 +	dirmngr: Improve debug output for TLS.
 +	+ commit 714faea4fa7f30d42e9986358214a99aa8fa57b3
 +	* dirmngr/misc.c (dump_cert): Also print SubjectAltNames.
 +
 +	dirmngr: Change internal SRV lookup API.
 +	+ commit 16078f3deea5b82ea26e2f01dbd3ef3a5ce25410
 +	* dirmngr/dns-stuff.c (get_dns_srv): Add args SERVICE and PROTO.
 +	* dirmngr/http.c (connect_server): Simplify SRV lookup.
 +	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
 +	* dirmngr/t-dns-stuff.c (main): Adjust for changed get_dns_srv.
 +
 +	dirmngr: Strip root zone suffix from libdns SRV results.
 +	+ commit 9fa94aa10778bbd680315e93b23175423e338c40
 +	* dirmngr/dns-stuff.c (getsrv_libdns): Strip trailing dot from the
 +	target.
 +
 +2017-01-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent,w32: Fix annoying output to DebugView.
 +	+ commit 8d774904c8066d8c0f19cfffe2d568979bb8c470
 +	* agent/gpg-agent.c (startup_fd_list): Do not define for W32.
 +	(main) [W32]: Do not call get_all_open_fds.
 +
 +2017-01-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for --disable-ccid for scdaemon.
 +	+ commit 858e14cd794e2a6125d51e652a754bbe26def997
 +	* scd/apdu.c (apdu_dev_list_finish): Don't call ccid_dev_scan_finish
 +	with no table.
 +	(apdu_open_reader): Only increment when it's zero.
 +
 +	scd: Fix for --disable-ccid-driver.
 +	+ commit 62268a2732dddca7a05ca4cf45d0e4338c7dc3c4
 +	* scd/apdu.c [HAVE_LIBUSB] (apdu_dev_list_start): Conditionalize.
 +	[HAVE_LIBUSB] (apdu_dev_list_finish, apdu_open_reader): Likewise.
 +
 +	scd: Support multiple readers by CCID driver.
 +	+ commit 8a41e73c31adb86d4a7dca4da695e5ad1347811f
 +	* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
 +	(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
 +	(apdu_close_reader): ... by this function now.
 +	(apdu_prepare_exit): Likewise.
 +	(open_ccid_reader): Open with dev_list.
 +	(apdu_dev_list_start, apdu_dev_list_finish): New.
 +	(apdu_open_one_reader): New.
 +	(apdu_open_reader): Support multiple readers.
 +	* scd/app.c (select_application): With SCAN, opening all readers
 +	available, and register as new APP.
 +	(app_write_learn_status): app->ref_count == 0 is valid for APP which is
 +	not yet used.
 +	(app_list_start, app_list_finish): New.
 +	* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
 +	Add BAI.
 +	(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
 +	(ccid_dev_scan, ccid_dev_scan_finish): New.
 +	(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
 +	(ccid_open_reader): Support multiple readers.
 +	(ccid_set_progress_cb, ccid_close_reader): No RID any more.
 +
 +2017-01-05  Werner Koch  <wk at gnupg.org>
 +
 +	Silence two -Wlogical-op warnings.
 +	+ commit 6170eb809033c9d144abf3b1f31f8b936878cdd4
 +	* common/tlv.c (parse_ber_header): Avoid compiler warning about a
 +	duplicate condition.
 +	* tools/gpgtar-create.c (pattern_valid_p): Likewise.
 +
 +2017-01-05  Justus Winter  <justus at g10code.com>
 +
 +	tests: New test for --{show,override}-session-key.
 +	+ commit 168c8c9d79a817c1f08a9ef976dab377f8c4c69e
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/decrypt-session-key.scm: New file.
 +
 +	tests: Fix macro.
 +	+ commit 4ded213698123a425393b89a800fda2a4ec5229d
 +	* tests/openpgp/defs.scm (with-ephemeral-home-directory): Make
 +	hygienic, use define-macro, do not change to the ephemeral home
 +	directory.
 +	* tests/gpgsm/setup.scm: Change to the ephemeral home directory.
 +	* tests/openpgp/setup.scm: Likewise.
 +
 +2017-01-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: avoid warning when --disable-tofu.
 +	+ commit 38671cfe5a2a40bb991619f4cb992c42b5f1e8cd
 +	If configured with --disable-tofu, we see compiler warnings about an
 +	unused variable.  This should remove those warnings.
 +
 +2017-01-04  Justus Winter  <justus at g10code.com>
 +
 +	tests,w32: Fix locating the components.
 +	+ commit 28e149609da44fab600f6a11b385d1c8ca8e7eb9
 +	* tests/openpgp/defs.scm (percent-decode): New function.
 +	(bin-prefix): New variable.
 +	(installed?): Likewise.
 +	(tool-hardcoded): Use the new variables.
 +	(gpg-conf): Use the new function to decode the values.
 +	(gpg-components): Do not use '--build-prefix' when 'installed?'.
 +
 +2017-01-03  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Make sure Tor mode is also set for DNS on SIGHUP.
 +	+ commit 969512401603639e4467ede7d892f1b02582c2c9
 +	* dirmngr/dns-stuff.c (enable_dns_tormode): Always succeed.
 +	(reload_dns_stuff): Reset tor port.
 +	* dirmngr/dirmngr.c (set_tor_mode): Also enable Tor mode for DNS.
 +	(main): Remove warning that Tor mode may not fully work.
 +	* dirmngr/server.c (cmd_dns_cert): Remove explicit Tor for DNS
 +	initialization.
 +	* dirmngr/t-dns-stuff.c (main): Remove option --new-circuit and error
 +	checking for enable_dns_tormode.
 +
 +	dirmngr: New debug message on correctly initialized libdns.
 +	+ commit 0004d52ba2f1245c84f95a151342ad99fd72ca3d
 +	* dirmngr/dns-stuff.c (libdns_init): Add debug level diagnostic on
 +	success.
 +
 +2017-01-02  Justus Winter  <justus at g10code.com>
 +
 +	common: Turn assertions into expressions.
 +	+ commit a1e0d4a1e75fc6e6c3392a4e1d1d27005b38d6cc
 +	* common/logging.h (log_assert): Turn this into an expression so it
 +	can be used in expressions.
 +
 +	tests: Fix faked time in the TOFU test.
 +	+ commit 6d065198337b5242889723481bfa9ce81aa108bb
 +	* tests/openpgp/tofu.scm (GPG): Fix time delta.
 +
 +2017-01-02  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Improve printing of debug infos.
 +	+ commit 5b6ebfb9244602d9de31d61c7eceb0c45ac8aa49
 +	* g13/g13tuple.c (all_printable): Make it work.
 +
 +	Replace use of variable-length-arrays.
 +	+ commit 6b84ecbf312d98ac8cce9fe5facdc815bc742fa1
 +	* common/t-iobuf.c (main): Replace variable-length-array.
 +	* g10/gpgcompose.c (mksubpkt_callback): Ditto.
 +	(encrypted): Ditto.
 +	* g10/t-stutter.c (log_hexdump): Ditto.
 +	(oracle_test): Ditto.
 +	* g10/tofu.c (get_policy): Ditto.  Use "%zu" for size_t.
 +	* scd/app-openpgp.c (ecc_writekey): Replace variable-length-array.
 +	Check for zero length OID_LEN.
 +
 +2017-01-02  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fail if too many arguments are given.
 +	+ commit b0e14bd6ff8401b12b2b39f75aef94d3ad28017f
 +	* tests/gpgscm/scheme.c (opexe_0): Enable check.
 +	* tests/gpgscm/tests.scm (test::report): Remove superfluous argument.
 +
 +	gpgscm: Add 'finally', rework all macros.
 +	+ commit b79274a3b7e58f88e9a8c1dc1fb24dd3e983543c
 +	* tests/gpgscm/init.scm (finally): New macro.
 +	* tests/gpgscm/tests.scm (letfd): Rewrite.
 +	(with-working-directory): Likewise.
 +	(with-temporary-working-directory): Likewise.
 +	(lettmp): Likewise.
 +
 +	gpgscm: Use boxed values for source locations.
 +	+ commit e8b843508dac96e9d0a3140954dd5a3618669cec
 +	* tests/gpgscm/scheme-private.h (struct port): Use boxed values for
 +	filename and current line.  This allows us to use the same Scheme
 +	object for labeling all expressions in a file.
 +	* tests/gpgscm/scheme.c (file_push): Use boxed type for filename.
 +	(mark): Mark location objects of port objects.
 +	(gc): Mark location objects in the load stack.
 +	(port_clear_location): New function.
 +	(port_reset_current_line): Likewise.
 +	(port_increment_current_line): Likewise.
 +	(file_pop): Adapt accordingly.
 +	(port_rep_from_filename): Likewise.
 +	(port_rep_from_file): Likewise.
 +	(port_close): Likewise.
 +	(skipspace): Likewise.
 +	(token): Likewise.
 +	(_Error_1): Likewise.
 +	(opexe_0): Likewise.
 +	(opexe_5): Likewise.
 +	(scheme_deinit): Likewise.
 +	(scheme_load_file): Likewise.
 +	(scheme_load_named_file): Likewise.
 +
 +2017-01-02  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Strip root zone suffix from libdns cname results.
 +	+ commit b200e636ab20d2aa93d9f71f3789db5a04af0a56
 +	* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
 +	(get_dns_cname_libdns): Ditto.
 +
 +2016-12-30  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix select_application.
 +	+ commit 337690441fcb19343fe56b139f5649bed7d25c83
 +	* scd/app.c (select_application): Fix the condition for open.
 +
 +	scd: Fix card removal monitor.
 +	+ commit f300e12a793d59deb1a369713384eaabfa39b3e6
 +	* scd/app.c (app_reset): Call send_client_notification with REMOVAL.
 +	(scd_update_reader_status_file): Likewise.
 +	* scd/command.c (send_client_notifications): Distinguish removal.
 +
 +2016-12-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Improve internal CCID driver.
 +	+ commit cdc8d0bd933b958db878861587322bc541b580b3
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Don't scan for
 +	configuration but use active configuration.  Support alt_setting.
 +	(scan_or_find_devices): Support alt_setting.
 +	(ccid_open_reader): Support alt_setting.
 +
 +	scd: Fix a race condition for new_reader_slot.
 +	+ commit c48cf7e32ffa02ebdf00265543344c611bef0431
 +	* scd/apdu.c (reader_table_lock, apdu_init): New.
 +	(new_reader_slot): Serialize by reader_table_lock.
 +	* scd/app.c (lock_app, unlock_app, app_new_register): Fix error code
 +	usage.
 +	(initialize_module_command): Call apdu_init.
 +	* scd/scdaemon.c (main): Handle error for initialize_module_command.
 +
 +2016-12-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: APP centric approach for device management.
 +	+ commit 4cc9fc5eb9bd91d943c185d59da4a2b4cb885ee6
 +	* scd/app.c (lock_app): Rename from lock_reader and use internal field
 +	of APP.
 +	(unlock_app): Likewise.
 +	(app_dump_state): Use APP.
 +	(application_notify_card_reset): Remove.
 +	(check_conflict): Change API for APP, instead of SLOT.
 +	(check_application_conflict): Likewise.
 +	(release_application_internal): New.
 +	(app_reset): New.
 +	(app_new_register): New.
 +	(select_application): Change API for APP, instead of SLOT.
 +	(deallocate_app, release_application): Modify for manage link.
 +	(report_change): New.
 +	(scd_update_reader_status_file): Moved from command.c and
 +	use APP list, instead of VREADER.
 +	(initialize_module_command): Moved from command.c.
 +
 +	* scd/command.c (TEST_CARD_REMOVAL): Remove.
 +	(IS_LOCKED): Simplify.
 +	(vreader_table): Remove.
 +	(vreader_slot, update_card_removed): Remove.
 +	(do_reset): Call app_reset.
 +	(get_current_reader): Remove.
 +	(open_card): Add SCAN arg.
 +	(cmd_serialno): No retry, since retry is done in lower layer in apdu.c.
 +	No do_reset, since it is done in lower layer.
 +	Add clearing card_removed flag.
 +	(cmd_disconnect): Call apdu_disconnect.
 +	(send_client_notifications): Modify for APP.
 +	(update_reader_status_file): Remove.
 +
 +	scd: Simplify monitoring card removal.
 +	+ commit f9882d8336feea96e3b5e250e9093f8cca01e08b
 +	* scd/apdu.c (struct reader_table_s): Remove any_status, last_status,
 +	status, and change_counter field.
 +	(new_reader_slot, dump_reader_status, ct_activate_card, open_ct_reader)
 +	(connect_pcsc_card, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
 +	(open_ccid_reader, apdu_reset): Follow the change.
 +	(ct_dump_reader_status): Remove.
 +	(apdu_get_status_internal, apdu_get_status): Remove CHANGED arg.
 +	(apdu_connect): Follow the change.
 +	* scd/command.c (struct vreader_s): Remove reset_failed, any, and
 +	changed field.
 +	(cmd_getinfo, update_reader_status_file): Follow the change.
 +
 +2016-12-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Improve internal CCID driver.
 +	+ commit c7ec9c42246033e14ebad679d11f3b1fbeed23b7
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Fix return value.
 +	Support device with multiple CCID interfaces.  Fix the case with
 +	READERNO.  Support partial string match of "reader-port" like PC/SC
 +	driver.
 +
 +2016-12-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: Fix for --disable-libdns usage.
 +	+ commit d26c51825e2255fe58305cbc1cd74fa43f80d93e
 +	* dirmngr/dns-stuff.c (enable_recursive_resolver, set_dns_nameserver)
 +	(reload_dns_stuff): Conditionalize with USE_LIBDNS.
 +	(get_h_errno_as_gpg_error): Map HOST_NOT_FOUND to GPG_ERR_NO_NAME.
 +
 +2016-12-22  Neal H. Walfield  <neal at g10code.com>
 +
 +	tools: Show a clearer error message if a server doesn't support WKS.
 +	+ commit 1909e994cb87d6c6866a465f0c20a456d4df46cc
 +	* tools/gpg-wks-client.c (command_send): If we fail to lookup the
 +	submission address, print a better error message.  If it is because
 +	the corresponding file doesn't exist, provide the hint that the server
 +	probably doesn't support WKS.
 +
 +2016-12-22  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Let the client ignore missing policy flags.
 +	+ commit e917dfcd973a3ebbf5eb584e819ffa89f932bfef
 +	* tools/gpg-wks-client.c (command_send): Ignore missing policy flags.
 +
 +2016-12-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Clean up internal API for APP.
 +	+ commit 8431f5a7e88e1f42d75c4a4b61f4aa9b35457204
 +	* scd/app-common.h (app_readcert, app_readkey, app_setattr, app_sign,
 +	app_auth, app_decipher, app_get_challenge, app_check_pin): Add CTRL as
 +	the second argument.
 +	* scd/app.c: Supply CTRL to lock_reader calls.
 +	* scd/command.c (cmd_readcert, cmd_readkey, cmd_pksign, cmd_auth,
 +	cmd_pkdecrypt, cmd_setattr, cmd_random, cmd_checkpin): Follow the
 +	change.
 +
 +2016-12-21  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Guard use of union member.
 +	+ commit 6e96cdd41a0e55b672309431062f37c4a4a9f485
 +	* tests/gpgscm/scheme.c (opexe_5): Check that we have a file port
 +	before accessing filename.  Fixes a crash on 32-bit architectures.
 +
 +2016-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Avoid skipping exectool tests.
 +	+ commit 6204f8104fea42d706a68e77e2dc0bca4704bddc
 +	* common/t-exectool.c (test_executing_true): Try also /usr/bin/true.
 +	(test_executing_false): Try also /usr/bin/false.
 +
 +2016-12-20  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add test suite for gpgsm.
 +	+ commit 36c14139285982def6ad942d4b2d8bef7ed4ea76
 +	* configure.ac (AC_CONFIG_FILES): Add new file.
 +	* tests/Makefile.am (SUBDIRS): Add new directory.
 +	* tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939: New file.
 +	* tests/gpgsm/Makefile.am: Likewise.
 +	* tests/gpgsm/cert_dfn_pca01.der: Likewise.
 +	* tests/gpgsm/cert_dfn_pca15.der: Likewise.
 +	* tests/gpgsm/cert_g10code_test1.der: Likewise.
 +	* tests/gpgsm/decrypt.scm: Likewise.
 +	* tests/gpgsm/encrypt.scm: Likewise.
 +	* tests/gpgsm/export.scm: Likewise.
 +	* tests/gpgsm/gpgsm-defs.scm: Likewise.
 +	* tests/gpgsm/import.scm: Likewise.
 +	* tests/gpgsm/plain-1.cms.asc: Likewise.
 +	* tests/gpgsm/plain-2.cms.asc: Likewise.
 +	* tests/gpgsm/plain-3.cms.asc: Likewise.
 +	* tests/gpgsm/plain-large.cms.asc: Likewise.
 +	* tests/gpgsm/run-tests.scm: Likewise.
 +	* tests/gpgsm/setup.scm: Likewise.
 +	* tests/gpgsm/shell.scm: Likewise.
 +	* tests/gpgsm/sign.scm: Likewise.
 +	* tests/gpgsm/verify.scm: Likewise.
 +
 +	tests: Add macro managing ephemeral home directories.
 +	+ commit c067a012c764218b94ce8de2914615a895a75f3e
 +	* tests/openpgp/defs.scm (with-ephemeral-home-directory): New macro.
 +	* tests/openpgp/setup.scm: Use the new macro.
 +
 +	tests: Move argument parser.
 +	+ commit a30c0a6972cabde3858108e9020e900696094843
 +	* tests/gpgme/gpgme-defs.scm (flag): Move...
 +	* tests/gpgscm/tests.scm: ... over here.
 +
 +	tests: Add missing encrypted sample, cleanup samples handling.
 +	+ commit e2ed3c1597daf3188ddce049cc3c50113d56f1b9
 +	* tests/openpgp/Makefile.am (TEST_FILES): Add new file.
 +	* tests/openpgp/defs.scm (plain-files): Add 'plain-large'.
 +	(all-files): New variable.
 +	(create-sample-files): New function.
 +	(create-legacy-gpghome): Use new function.
 +	* tests/openpgp/plain-large.asc: New file.
 +
 +2016-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.17.
 +	+ commit ade32464a25fdb35cc0f39e46d303ceba68ea8f6
 +
 +
 +	sm: Remove wrong example from gpgsm --help.
 +	+ commit 13465e708bb67e816e4fb3a37c117ad91dc6383f
 +	* sm/gpgsm.c (opts): Remove group 303.
 +
 +	dirmngr: New option --resolver-timeout.
 +	+ commit 81c012787fabf734d9c952c6f18ecac21929d4d8
 +	* 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.
 +
 +	* 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.
 +	+ commit af8b68fae39b1378c769e0de6ba6437ea1aac7e3
 +	* 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.
 +	+ commit 284ec54495dddc9eb0232e959cf994234097578a
 +	* 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.
 +	+ commit 65a0d6a24e6299682793f213a9d2bae17c5b12d9
 +	* 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.
 +	+ commit 0bf16d702665a269ce5ef724c927fbbd8f7f1ce9
 +	* 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.
 +	+ commit d51499fdc522a696f23c6776c3ab248742f4e06a
 +	* 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.
 +	+ commit aec89a7297bae30f79a63fdc830530e82bab6170
 +	* 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.
 +	+ commit a1afc450e182af02ad5e6f6ba79e9dc4332ca2bc
 +	* 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 ::.
 +	+ commit a45dc0849da0d944ec8c759bc8e3e733b1eb0079
 +	* 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.
 +	+ commit 3949cbd1128585c9b810713aeffaa1455fb5aed9
 +	* tests/gpgscm/lib.scm (assert): Use location information if
 +	available.
 +
 +	gpgscm: Make exception handling more robust.
 +	+ commit df00745d6eed7034b218a0c482a46d975425798a
 +	* 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.
 +	+ commit 026bbf0d5ee4510967e5f1dd3db2dee4687b0612
 +	* 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".
 +	+ commit e384405b6e251629fb36bcbba4f5f9ac15a39d10
 +	* 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.
 +	+ commit e77b924fec1082faae48cdd2ff8474874a22bdf7
 +	* 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.
 +	+ commit 024dbd7162fc1a7694176ebad3c21ee3ea67c024
 +	* 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.
 +	+ commit c4e8a3194d6b92f596a6483e486c645de7d2ddd1
 +	* 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.
 +	+ commit ddb48086833f8b86f0f0d69b21a23f245090ea7a
 +	* 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.
 +	+ commit 59d3c3e4baffff52548fb5d1766ebf02dd8e1bec
 +	* 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.
 +	+ commit 48671f295ff233765689b6a73021f83ab845a28f
 +	* 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.
 +	+ commit 76cd64a5baf6057b199c01f7999b327f1f4a87bc
 +	* 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.
 +	+ commit 6ca3c28da46873416822bf6ab7893db6c56a49d6
 +	* 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.
 +	+ commit 12a5265afa7f87ad92fb571e0882e57b07a3c267
 +	* doc/DETAILS: Mention that 'PINENTRY_LAUNCHED may carry extra
 +	information.
 +
 +	sm: Fix agent communication.
 +	+ commit 3c7d6a1769ed6cc90d86247a814a0dce341512a3
 +	* 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.
 +	+ commit a165fa09be4bfbeb97ebe25d551a9045255e5028
 +	* 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.
 +	+ commit 4a2c210b75d4266e289712e73a42c286aabb07f0
 +	* 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>
 +	+ commit 94f6b9010d2e80a75ccbb21426faf0b30195f1ab
 +	* 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.
 +	+ commit ca02a8b78fca8815388a859962584d75169ae3ee
 +	* 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.
 +	+ commit 116a78eb869c4c589228bd0d6deff7c7a9f92dfb
 +	* 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.
 +	+ commit fea9da4a8afab6f3a49cdbbcc4a7a21f27a6d3e8
 +	* 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.
 +	+ commit 6caa2d0ba2bfc0ae93878738b0169483f6b6b462
 +	* g10/tofu.c (tofu_register_encryption): Add missing space.
 +
 +2016-12-15  Justus Winter  <justus at g10code.com>
 +
 +	g10: Avoid translating simple error messages.
 +	+ commit 6b16b02109f4bb5b934e456667ff4c0ba7bc85fd
 +	* g10/gpg.c (main): Avoid translating arguments to 'wrong_args'.
 +
 +	g10: Rework the --quick-* interface.
 +	+ commit 41ad04d403de05abe54280d2a84aa51a603194e4
 +	* g10/gpg.c (opts): Rename options.
 +	(main): Update errors.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10: Rename 'card-edit' to 'edit-card'.
 +	+ commit 6e4396723e9e5865015ebf7033628fa3919cf7d1
 +	* 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.
 +	+ commit 3c691097ca144e9a1d4c9185636c59a848bec85c
 +	* g10/gpg.c (opts): Rename option.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10: Shorten unreasonably long option.
 +	+ commit c252627c6fd93bc305c5a5a2f013c3de2d45c6b0
 +	* 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.
 +	+ commit bc6b76ef26f31c54ae1c29c761b8ecc437fcf565
 +	* 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.
 +	+ commit 2d1760ffe2ff46b77bd0f38db8b781d9564ae999
 +	* 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.
 +	+ commit 0e2055c7d30d987a7a74923a7080b80cce470601
 +	* tests/gpgme/Makefile.am (CLEANFILES): New variable, clean test logs.
 +
 +2016-12-14  Justus Winter  <justus at g10code.com>
 +
 +	tests: Reuse GPGME's tests.
 +	+ commit 948cca9c99e701a1668bb5fd6e25f07e35381b4d
 +	* 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.
 +	+ commit ca1e9749bfb069d90aa44efbf6f3d611b6104c1b
 +	* 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.
 +	+ commit 55dc81125abc43cd3cc8db951fc3b8a81767942d
 +	* 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.
 +	+ commit d34a2bb410c7c770d26430d69ff77bd83fc407f1
 +	* 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.
 +	+ commit 3c2a7918eac024b5e1258ea9b272b4e8a1f1af43
 +	* 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.
 +	+ commit 4c13e4e3debe0e55e86ae29c095f2d86eb0a6f11
 +	* 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.
 +	+ commit 4a030f682ef48542ed324b28207f2c2b4847dbef
 +	* 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.
 +	+ commit 392966aed9b2a5e1456c671e5d13b561a27e4bb2
 +	* 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.
 +	+ commit d84f5a88233c073a82fd47728574b001343784ee
 +	* 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.
 +	+ commit aae68a3ccd3d9870162b3ffd49eae08d5bf1b1e1
 +
 +
 +2016-12-14  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: New libdns snapshot.
 +	+ commit f8ab2c4c70ad15c4b2e45492606fb94ddaccdac7
 +
 +
 +	dirmngr: Add basic libdns support.
 +	+ commit f6acd0426453d3a18536ca69d63baa0d971082ef
 +	* 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.
 +	+ commit 2e734a3ce159de8fb60df2bd5d454f98ca710717
 +	* 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.
 +	+ commit 57aa42ce9b28bc17ac24491d595766fbf80762af
 +	* 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.
 +	+ commit c1c35fb887061de05661f3411eda97546e1a52d7
 +	* 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.
 +	+ commit ec1bd3ae685e95563e38077ab3c1655fd55dea07
 +	* g10/gpg.c (opts): Spell out option.
 +	* doc/gpg.texi: Update accordingly.
 +	* po: Update translations.
 +
 +	g10: Spell out --full-gen-key.
 +	+ commit 09163a6390bd9713f3a7946de739765b30ef6f64
 +	* 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.
 +	+ commit 892c827e72b1396e3b58e2f8869cc48328a2b59c
 +	* g10/gpg.c (opts): Spell out option.
 +	* sm/gpgsm.c (opts): Likewise.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10,sm: Spell out --check-sigs.
 +	+ commit 9147737f1c6894f38b855f3cf38cd33122a1ae2a
 +	* g10/gpg.c (opts): Spell out option.
 +	* sm/gpgsm.c (opts): Likewise.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10,sm: Spell out --list-sigs.
 +	+ commit a6d6e4afe488bc05ee730e85da6a9505c6cd245a
 +	* g10/gpg.c (opts): Spell out option.
 +	* sm/gpgsm.c (opts): Likewise.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10: Hyphenate --clearsign.
 +	+ commit 04754ce3a704b1e6d38cb9a28dacf2821dc3f15f
 +	* g10/gpg.c (opts): Hyphenate option.
 +	* doc/gpg.texi: Update accordingly.
 +	* po: Update translations.
 +	* tests/openpgp: Update tests.
 +
 +	g10: Spell out --recv-keys.
 +	+ commit ca598152345b40f3a236227dfc63ae04ddf777d7
 +	* g10/gpg.c (opts): Spell out option.
 +	* doc/gpg.texi: Update accordingly.
 +
 +	g10: Create expiring keys in quick key generation mode.
 +	+ commit dd3dde07a9a46130ac01d849f8edf0566e44f11f
 +	* 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.
 +	+ commit 429891a704057437517cb0b45d11392b40fa1ee8
 +	* tests/gpgscm/tests.scm (test-pool::report): Print failed and skipped
 +	tests at the end.
 +
 +	gpgscm: Generalize the test runner.
 +	+ commit d43dabf4607d3bcfc217eb9aea34d093f5aa698f
 +	* 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.
 +	+ commit 1a176b92a8aad42056ed2c4e1f49a5feb40770cf
 +	* tests/openpgp/run-tests.scm: Move most of the code...
 +	* tests/gpgscm/tests.scm: ... here.
 +
 +	tests: Refactor test runner.
 +	+ commit fe36e63763c9c595bb057ac50160d2aff7c7a63f
 +	* 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.
 +	+ commit e3876f16eb237bdeb9f79aca2e7db5e9e2d86686
 +	* 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.
 +	+ commit 98433c70431dfbde99b0e89416856d1eef9ebc88
 +	* g10/keygen.c (ecckey_from_sexp): Release curve.
 +
 +	gpg: Do not use a fixed string for --gpgconf-list:default_pubkey_algo.
 +	+ commit f1304ee9b21e6ceac6c13d04ceddd23fadb5c7f1
 +	* 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.
 +	+ commit 522e6f798db9f3f3a9e0123fdc389a86ac69dedf
 +	* 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.
 +	+ commit d568a1561642ed9b7b7b6282b86c56786d10a956
 +	* g10/keygen.c (default_expiration_interval): New variable.
 +	(generate_keypair): Use the new default.
 +
 +	tests: Add a test for '--quick-addkey'.
 +	+ commit b778d8deedf344c8116362633925b8153c7f1bf1
 +	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-addkey'.
 +
 +	tests: New test using all available compression algorithms.
 +	+ commit 59f1562c25119a4fe27411e6350f2149d6147148
 +	* 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.
 +	+ commit c8100fc0faadf8ba35e4df32b4760cc975e3a83d
 +	* g10/gpg.c (list_config): List all enabled compression algorithms
 +	under the key 'compressname'.
 +
 +	g10: Fix memory leak.
 +	+ commit 3de9bad359e28ced4a2539e411d222ffd82a4a62
 +	* 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.
 +	+ commit 5c7d58222834793629a30248e72b6ea96e832dc4
 +	* common/argparse.c (optfile_parse): Detect and skip the UTF-8 BOM.
 +
 +	Fix 2 compiler warnings.
 +	+ commit cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8
 +	* 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.
 +	+ commit 4a04277ad112e0966296133795f93cf6a3daa48e
 +	* 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.
 +	+ commit e7429b1ced0c69fa7901f888f8dc25f00fc346a4
 +	* 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.
 +	+ commit 404e8a4136bbbab39df7dd5119841e131998cc15
 +	* 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.
 +	+ commit 01256694f006405c54bc2adef63ef0c8f07da9ee
 +	* 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.
 +	+ commit a4a69163d9d7e4d9f3339eb5cda0afb947180b26
 +	* 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.
 +	+ commit fcf5aea44627def43425d03881e20902e7c0331e
 +	* 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.
 +	+ commit a75790b74095828f967c012eff7033f570d93077
 +	* g10/tofu.c (build_conflict_set): Revert to int* and fix calloc.
 +
 +	wks: New option --check for gpg-wks-client.
 +	+ commit d8c5e8ccfdb53cc327f7520fc7badc31d0c9c666
 +	* 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.
 +	+ commit c3138decd77d788906885b638b344d0d1faf32c0
 +	* 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'.
 +	+ commit a2bedc8ac6fcdcd1de0a9fa3d540006481387dff
 +	* tests/gpgscm/tests.scm (for-each-p): Generalize to N lists like
 +	for-each.
 +	(for-each-p'): Likewise.
 +
 +	g10: Fix out-of-bounds access.
 +	+ commit 3b5b94ceab7c0ed9501c5cf54b4efa17fcd7300a
 +	* 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.
 +	+ commit dd03667ab1062bba3b9413c3f8007d63302d1b31
 +	* 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.
 +	+ commit b265969154741bf9f93167699fe7ddda1d485265
 +	* tools/gpgconf.c (main): Free SOCKETDIR.
 +
 +	gpg: Fix portability problem.
 +	+ commit c3008bffac68b6f31e9ae9bad837cdce5de7c0db
 +	* 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'.
 +	+ commit dec2ae31a46a0f41886c7ad228865cc573f2dea9
 +	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-set-expire'.
 +
 +	tests: Improve quick key manipulation test.
 +	+ commit 92df40a3a2ae471fbba00d6d7040230404931fd4
 +	* 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.
 +	+ commit 8636ad5023a1bdc527add40a5508f8c5b7c35221
 +	* 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.
 +	+ commit e352ead43fbb0180e1f1c71bf1a000d1954eb777
 +	* 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'.
 +	+ commit 5b5d881f47c82f320abf440c20b7a1bac078a987
 +	* 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.
 +	+ commit 89ac071eb4c7539e98c7dc17e11f57c620b54e90
 +	* tests/openpgp/tofu.scm: Remove debugging display.
 +
 +2016-12-06  Neal H. Walfield  <neal at g10code.com>
 +
 +	tests: Update distributed files.
 +	+ commit 87972fdef2cd853fb97624d0765686674a19e3c4
 +	* 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.
 +	+ commit 7572d270fcda1614648c6f08d711d5096ffebbe6
 +	* doc/gpg.texi: Improve the text.
 +
 +	g10: Avoid a memory leak.
 +	+ commit 6102099985c1b82b6c0bba0464c1f913cc673e96
 +	* g10/gpg.c (main): Free KB when we're done with it.
 +
 +	tests: Change (interactive-shell) to start an interactive shell.
 +	+ commit db6d8cfdc118131f497596ef1ffc121949377754
 +	* tests/gpgscm/tests.scm (interactive-shell): Start an interactive
 +	shell.
 +
 +	tests: Check the signature count in the TOFU TFS record.
 +	+ commit 17c717d7c92d9a52101fea7e396fc133322a8786
 +	* tests/openpgp/tofu.scm: Check the signature count in the TOFU TFS
 +	record.
 +
 +	tests: Replace data used by the TOFU conflict test.
 +	+ commit d5b18d6c55d65e8df2dd112651e3b9b3d9e6e27a
 +	* 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.
 +	+ commit bd9ebe1404c1395edd0e029023a9e780c90f6d73
 +	* 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.
 +	+ commit 41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d
 +	* 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'.
 +	+ commit fae4d06b0ccaa9803e0c0da56c327b0bcfffcac5
 +	* 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.
 +	+ commit ef10c348bffc7dad19e1832bebc453755d209420
 +	* 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.
 +	+ commit ce29272e24e7b718b8fca9b84bc728e65f3dea24
 +	* 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.
 +	+ commit cd532bb7b866e104304e2443cc942799c385daa5
 +	* 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.
 +	+ commit bd1a1d8582abcfd7f29812942fa70f88d0aec7cf
 +	* 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.
 +	+ commit 304566d3327ef0a85188cce3109d46d5ff47177a
 +	* 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.
 +	+ commit 86efc3ee53abaf1e22b53c1b360c51829e476115
 +	* 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.
 +	+ commit fbdfe6a514a95fb46f2b811a13709024e2baf252
 +	* tests/openpgp/Makefile.am (sample_msgs): Add messages required for
 +	the new test 'verify-multifile.scm'.
 +
 +	tests: Add test for '--verify --multifile'.
 +	+ commit 12af8e84a32df728462da09a00a8bec24a487720
 +	* 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'.
 +	+ commit 3c0569e99498c7470ebdb639b4c5ae829af92761
 +	* 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.
 +	+ commit aa6ab9e0bc67fe9ce5601047e84ea4a875e8eb64
 +	* 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.
 +	+ commit 854adc8ae19749e44cb79dfa0c5401f48012b13a
 +	* 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.
 +	+ commit 8489b12211098ad58c008cfb74b5cb91849cf68d
 +	* sm/decrypt.c (prepare_decryption): Handle a 16 byte session key.
 +
 +	agent,w32: Initialize nPth in server mode.
 +	+ commit 81d6e98cdf4caa3aa92398fc3b8bed397b40f58d
 +	* agent/gpg-agent.c (main) [W32]: Call initialize_modules in server
 +	mode.
 +
 +	gpg: Make --decrypt with output '-&nnnn' work.
 +	+ commit a5910e00ace882b8a17169faf4607163ab454af9
 +	* 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.
 +	+ commit 60b4982836a00ef6b2a97d16f735b3f6b74dce62
 +	* 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.
 +	+ commit 52385a2ba1bf7e53f500ffde5fd34f28e69cf76b
 +	* g10/decrypt.c (decrypt_messages): Properly decrease the reference
 +	count of the armor filters after pushing them.
 +
 +	tools,build: Build WKS tools against libintl.
 +	+ commit 9fb5e9c14557f7567cbc7c50b9881b7d7bfa2f12
 +	* 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.
 +	+ commit 522f74f7e377135cf098b6b0b9b35284c1dfc963
 +
 +
 +	g10: Extend TOFU_STATS to always show the validity.
 +	+ commit 2f27cb12e30c9f6e780354eecc3ff0039ed52c63
 +	* 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'.
 +	+ commit bde4fddadc75ad6071e3fc6c0980905de14c03cb
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/decrypt-multifile.scm: New file.
 +
 +	gpgscm: Avoid truncating pointers.
 +	+ commit e062bc4da8062b822ee85096d9adfcbca8dcb56a
 +	* 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.
 +	+ commit f6728d13e8e544dbd4b9351ed981613e5504293f
 +	* 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.
 +	+ commit ecc126a7cef371e3b88e65715ba37fb77e92ea0f
 +	* 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.
 +	+ commit 47b8b9e2ce5af7fba117ae0b00e10bec414dcfb0
 +	* 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.
 +	+ commit 4db9a425644dccaf81b51ebc97b32a9cc21941a4
 +	* 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.
 +	+ commit cc1d21342659a7def5d662d0547579f9e0d3b109
 +	* 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.
 +	+ commit b89e63e5c326af71470124b410e6429cbd2b5c43
 +	* 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'.
 +	+ commit 005d326d19ba28005182205f25edc4f7499ec0b5
 +	* tests/gpgscm/scheme.c (reverse): Update prototype, add terminator
 +	argument.
 +	(opexe_4): Update callsite.
 +
 +	gpgscm: Clean sweeped cells.
 +	+ commit 3fb9954c43425775a517060959dad01fa00238f7
 +	* tests/gpgscm/scheme.c (gc): Zero typeflag and car of free cells.
 +
 +	gpgscm: Fix initialization of 'sink'.
 +	+ commit 7856e3efaad7614979bc0b91379a0a4dcbc739d5
 +	* 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.
 +	+ commit 03a65a53231cc3132a50a1871e81a512c44da169
 +	* 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.
 +	+ commit bfeafe2d3f9bbaa7f11f3ad870a446141c038b0d
 +	* 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.
 +	+ commit 44c17bcb003a3330f595a6ab144e8439b7b630cb
 +	* 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.
 +	+ commit 5c2db9dedfe9dbb14ffec24751ca23a69cead94e
 +	* 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.
 +	+ commit a3b258d1d15953816e0567511ecc527a4ccdd626
 +	* tests/gpgscm/scheme.c (opexe_0): Reduce code duplication.
 +
 +	gpgscm: Fix property lists.
 +	+ commit d8df80427238cdbb9ae0f6dae8bc7e9c24f6e265
 +	* 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.
 +	+ commit 7b4e2ea274ace22245264f1759279390d0300a62
 +	* 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.
 +	+ commit 66834eb838a8892d088f6b7332084a64d9f15008
 +	* 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.
 +	+ commit 893a3f7fb46021961914a8acdf1292a80e3eba93
 +	* 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.
 +	+ commit 6ce14a805f1da687dfb8535db57730d5c7403db7
 +	* 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.
 +	+ commit 037f9de09298a31026ea2ab5fbd4a599b11cc34f
 +	* 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.
 +	+ commit 182efc5b5d20ac0d43501a22f349a23dc06a27a4
 +	* g10/tofu.c (ask_about_binding): Correctly parameterize ngettext.
 +
 +	g10: Don't use the same variable for multiple SQL compiled statements.
 +	+ commit 7142b293c870d73ce0146bfb90e6a556e0079650
 +	* 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.
 +	+ commit 91a0483c5db8ee4510981448a705981ee1cce199
 +	* 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/.
 +	+ commit 0540cfbee455b197edd89b602a4b47ebf0be8588
 +	* 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.
 +	+ commit 9a707a223a3d45ccf245dee7989ca144e4e6bb49
 +	* agent/gpg-agent.c (main): Remove duplicated initialization in daemon
 +	mode.
 +
 +2016-11-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.16.
 +	+ commit 0a641ad25d8c3b91dc32bb9f3f1ae49ae539a4f7
 +
 +
 +2016-11-18  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +	+ commit 11aaa9c6d4ed3e47de45b4aee925ab1065120988
 +
 +
 +2016-11-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix flags to open for lock of ToFU.
 +	+ commit 1c0b140cccfb884c6d07785c3284b9df06dccd3c
 +	* 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.
 +	+ commit 833eef974ad4721b9b3e247bae9c890476a936ce
 +	* 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.
 +	+ commit b3a917201207898059c048dd101344765201b03c
 +	* 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.
 +	+ commit b2e1b17efa952afcf7aeec8b15e9d0088dba587a
 +	* 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.
 +	+ commit b6066ab18a67195817babaf9eccf896c2b3c7b0e
 +	* 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.
 +	+ commit 8fb482252436b3b4b0b33663d95d1d17188ad1d9
 +	* 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.
 +	+ commit 7c1613d41566f7d8db116790087de323621205fe
 +	* 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.
 +	+ commit c4e02a3b7ad6ee1da6bfc439921378bdbd5c029c
 +	* 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.
 +	+ commit 4f189325a409bb08f7a8eabfac3f4579288cf5c5
 +	* tests/gpgscm/scheme.c (opexe_0): Enable gc before calling 'Error_1'.
 +
 +	gpgscm: Fix string.
 +	+ commit fc53a4d06eaf891143ab4efec9caffe31ebc2bc0
 +	* tests/gpgscm/scheme.c (type_to_string): Fix string.
 +
 +2016-11-17  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Auto-sownload the swdb.lst.
 +	+ commit bd91f92ace09263e3a91177f2a1644379baeb08a
 +	* 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.
 +	+ commit c45ca316a54665915ae08399484db271566db7c0
 +	* 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.
 +	+ commit d8da5bc50b856db3445435780311c9f8e52a5144
 +
 +
 +2016-11-16  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add command to only load the swdb.
 +	+ commit 52c10a280af6ce06eb1732ff35b095f2b8d24b9f
 +	* 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.
 +	+ commit 4839e6d002a8ad1f7d3260792c3c9641e258f342
 +	* 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.
 +	+ commit c4506a3f15bba5d257cb4c6738800c5e00ecc9a2
 +	* 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.
 +	+ commit c564790df723beef031d83802bd7830737bd330a
 +	* tools/Makefile.am (gpg_wks_client): Remove macro.
 +	(libexec_PROGRAMS): Add gpg-wks-client.
 +
 +	gpg: New option --override-session-key-fd.
 +	+ commit 43bfaf2c5417ede621c0a07721952ea549a7a139
 +	* 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.
 +	+ commit 500e594c2da530e69a63fc1a40d173458682fa0e
 +	* g10/gpgv.c (oEnableSpecialFilenames): New.
 +	(opts): Add option --enable-special-filenames.
 +	(main): Implement that option.
 +
 +	gpg: Add new compliance mode "de-vs".
 +	+ commit b47603a0ac24902c5bb000f8ef27cfb99aceeb81
 +	* 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.
 +	+ commit 8ea3b4c4102dc67ed83d4419b7171e422fc01047
 +	* 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.
 +	+ commit 12834e84aca9d74800245f0f2f2e6b5123e76173
 +	* g10/getkey.c (get_best_pubkey_byname): Use the node returned by
 +	'getkey_next' instead of doing another lookup.
 +
 +	g10: Fix memory leak.
 +	+ commit d20107f6da094edd782947abb357abae5129a12c
 +	* 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.
 +	+ commit 1d03cc77e1706f7da653153ad4b58c61e4fd2573
 +	* g10/getkey.c (getkey_next): Fix invocation of 'lookup'.  If we want
 +	to use RET_FOUND_KEY, RET_KEYBLOCK must be valid.
 +
 +	g10: Fix use-after-free.
 +	+ commit bd60742925414e0ef2a497df827c1913ea211a44
 +	* 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.
 +	+ commit 26c7c1d72c5f2acb3edb58d610c09a635c87bdbf
 +	* 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.
 +	+ commit 1f7639ebbe58af1b581b0be7809da9ee55482992
 +	* g10/keyedit.c (menu_adduid): Don't copy 'sig'.
 +
 +2016-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --compliance.
 +	+ commit f86b1a15ad4bb7bcc1e9f7d209aabcb23641f7df
 +	* 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.
 +	+ commit 809d67e74014cb563efd965744fd11f87bbae743
 +	* g10/keyedit.c (menu_adduid): Deallocate 'sig'.
 +
 +	gpgscm: Mark cells requiring finalization.
 +	+ commit 64a58e23c38db8658423bbe26fcd650330e24a88
 +	* 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.
 +	+ commit 93cc322ac06d3045a24aece90091f7f80f3dacb8
 +	* tests/gpgscm/scheme.c (_s_return): Recover the cell holding the
 +	opcode.
 +
 +2016-11-14  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix memory leak.
 +	+ commit 2cd281c4def1ea881b92b9aba18c1892f89c1870
 +	* g10/mainproc.c (check_sig_and_print): Free 'pk'.
 +
 +	gpgscm: Avoid cell allocation overhead.
 +	+ commit 83c184a66b73f312425b01008f0495610e5329a4
 +	* 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.
 +	+ commit 4ee4d0b02172cf56d9582bb99e32a65c75315b25
 +	* 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.
 +	+ commit 6bf698197222bf6081c249c815aebb075e8ec820
 +	* 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.
 +	+ commit 4473db1ef24031ff4e26c9a9de95dbe898ed2b97
 +	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Sleep for 100ms on
 +	"need_entropy".
 +
 +	dirmngr: Prepare to trigger jobs by network activity.
 +	+ commit 7b04a43c05834b937b32a596f1941e9728add5fa
 +	* 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.
 +	+ commit e51912f467fda963c7abcfcd4082d6eb084ba5be
 +	* 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.
 +	+ commit 5d13581f4737c18430f6572dd4ef486d1ad80dd1
 +	* 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.
 +	+ commit c8044c6e335f044d7386b9e8869bc4a0d3adff70
 +	* 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.
 +	+ commit ee08677d63a900cea85228024861a4f5c5a87c69
 +	* tests/gpgscm/scheme.c (ok_to_freely_gc): Recover cells.
 +
 +	gpgscm: Recover cells used to maintain interpreter state.
 +	+ commit e0cbd3389e2dd6ec19ee3a4c7bad81fa0f1907f5
 +	* 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.
 +	+ commit d3a98ff5bc972a4c9b01b9e5338a4a59b5b4ac48
 +	* 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.
 +	+ commit 568cfcde45a0d6c456d8f8be1ea0e408416badad
 +	* 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.
 +	+ commit 9ee184bc0afaea06785d836ed175b851b9ae532f
 +	* tests/gpgscm/scheme.c (opexe_5): Drop obsolete code.
 +
 +	gpgscm: Remove dubious stack implementation.
 +	+ commit d7c5799c282a03dcce0e3d327075233353cb76cc
 +	* 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.
 +	+ commit 088d955bd8a6ec8bbf76c8a4c01eb08499d1d9fa
 +	* 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.
 +	+ commit c7ea98cd3d44abf00e32c081e5049ad1d0b1f12c
 +	* 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.
 +	+ commit 1062953d5132af674aacfc6372e3e9f066c5d145
 +	* 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.
 +	+ commit 2a7615c48ed79e6b28710cc293ce30c812b2e5b0
 +	* 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.
 +	+ commit 4dd4801bfa4c3f7ba279b3d171a8ed299dbffaaa
 +	* tests/openpgp/issue2417.scm: Simplify.
 +
 +	gpgscm: Expose seek and associated constants.
 +	+ commit 591d61d80f4f81176f7e236df794922df9e001a1
 +	* 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.
 +	+ commit d4454837cd60981c2863955b11c9e1cc8f9e3833
 +	* tests/gpgscm/ffi.c (do_wait_processes): Fix and improve error
 +	messages.
 +
 +	tests,w32: Make cleanup more robust.
 +	+ commit dd13b2a561e31045fd3d3576bab99543cd4eb6cc
 +	* 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.
 +	+ commit 7cbb0803847b8db618d39ff50ae6015e409ab1ae
 +	* 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.
 +	+ commit 26df829fa22f027ca4a5eaf155cdaa2123afbdd5
 +	* 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.
 +	+ commit abe0cc7a21d2b0b5c77cc525b999d1ede2d29185
 +	* 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.
 +	+ commit 4d98a72b88cf167295e1ecd6125b9c7a11b6239f
 +	* 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.
 +	+ commit a55393cb5f4b331cb3a715c7d9a8b91f7606f337
 +	* 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.
 +	+ commit ac078469cbafe85cf771fca84f376740850d10b0
 +	* 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.
 +	+ commit 37751d2b194bc33539f5b9ea0e02e9f209d2bcf6
 +	* 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,
 +	+ commit 56e1864aa337f36317534db521fd4434d70e0784
 +	* 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.
 +	+ commit 70215ff470c82d144e872057dfa5a478cc9195f2
 +	* 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.
 +	+ commit 413cc50345557e0a516f33b98e8aab19bbc8b4fe
 +	* tests/gpgscm/lib.scm (call-with-binary-input-file): New function.
 +	(call-with-binary-output-file): Likewise.
 +
 +	gpgscm: Add support for pseudo-random numbers.
 +	+ commit 6e677f9b55fdb610e93134042ee41ee5c641cbdf
 +	* 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.
 +	+ commit 5840353d8bbcd9e75374f3bdb2547ffa7bbea897
 +	* 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.
 +
 +	Fixes: ab89164be02012f1bf159c971853b8610e966301
 +
 +2016-11-04  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix printing strings containing zero bytes.
 +	+ commit 1f45878a72f23d4bae08d73b614096b485f35274
 +	* tests/gpgscm/scheme.c (atom2str): Fix computing the length of Scheme
 +	strings.  Scheme strings can contain zero bytes.
 +
 +	gpgscm: Implement 'atexit'.
 +	+ commit 43f8006f5c75e3d15fe200e2fa41587a73bfb07b
 +	* 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.
 +	+ commit cd00b07ec26c3408e6aee66957b08c6fd319b700
 +	* scd/app-openpgp.c (do_readkey): Decrement the length.
 +
 +	scd: Add --advanced option for READKEY.
 +	+ commit f9da935c3eb302e75a80def51128fb6f669661d7
 +	* 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.
 +	+ commit c1ea0b577a468030d2b006317ba27fc1746c4b14
 +	* 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.
 +	+ commit ab89164be02012f1bf159c971853b8610e966301
 +	* 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.
 +	+ commit 1ec07cbc209f247fd85704f5701564e31aa56d0b
 +	* 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.
 +	+ commit d10b67b9bc32e8feff1be86e6646fc23e58fe45d
 +	* 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.
 +	+ commit 0ed6a6df5aa421a9c5cdb1e63867f0deee79af9e
 +	* 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.
 +	+ commit 488b183811fc25c1ae49b4730491accf1adf518e
 +	* 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.
 +	+ commit 60ad1a7f37ffc10e601e69a3e2d2bb14af510257
 +	* tests/gpgscm/ffi.c: Define magic macro to prevent the completion
 +	function from redefined.
 +
 +2016-11-02  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	build: Fix misspelled dirmngr.
 +	+ commit 5e693ddfbe44d149ce0d9393d699c613ad5ea706
 +
 +
 +	Spelling: correct spelling of "passphrase".
 +	+ commit 68b59bbc42ba9ec69496758743924d54a95742f0
 +	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.
 +	+ commit 5d4f1408d0dd055d412ae44bb4a0f28f74617f05
 +	* g10/tofu.c (begin_transaction): Use the new 'gnupg_usleep'.
 +
 +2016-10-31  Werner Koch  <wk at gnupg.org>
 +
 +	common: New function gnupg_usleep.
 +	+ commit ad491ceec6145b3781a05dc7b4a36052abeeb4b4
 +	* 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.
 +	+ commit 3b6b8fe32af7568ff51066d4c2e3679df6dea86f
 +	* 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.
 +	+ commit 7a634e48b13c5d5d295b8fed9b429e1b2109a333
 +	* 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.
 +	+ commit eec365a02bd35d2d5c9e4d2c8d18bcd9180cf859
 +	* 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.
 +	+ commit 614ca00676bb8ca12b5107fec0e4ef8818445254
 +	* 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.
 +	+ commit b6f08dbb0b45059cdbbb5d9be9725e437f42a8cc
 +	* 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.
 +	+ commit 5a1f6a0062488aaf345b1c73ba98a540e673d619
 +	* 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.
 +	+ commit 8fced66be35db5ac2a6bfdb9bccb2c0e582d8256
 +	* g10/mainproc.c (proc_tree): Loose check.  Enable all algos.
 +
 +	common: Add GNUPG_MODULE_NAME_GPGV.
 +	+ commit ece9ade4b44fb3d5d120cfd32b23632e5efd2134
 +	* 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.
 +	+ commit 8ea72a776a88f3c851e812d258355be80caa1bc1
 +	* g10/getkey.c (getkey_next): Return the public key in PK even if
 +	RET_KEYBLOCK is NULL.
 +
 +	g10: Assert preconditions.
 +	+ commit 66a0091d74768ab3a4a5342d3645e1834c59045a
 +	* g10/getkey.c (get_pubkey_byname): Assert preconditions.
 +
 +2016-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Do not implement --supervised in Windows.
 +	+ commit cf20b23c146c9e499263654644035796475de097
 +	* dirmngr/dirmngr.c (opts) [W32]: Remove --supervised.
 +	(main) [W32]: Ditto.
 +
 +	common: Remove debug output from gnupg_get_socket_name.
 +	+ commit a9c8b5fbe7ae241bf45bdee15884abc7891aedf9
 +	* 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.
 +	+ commit 45dfc02b47f798f5a3b9973ca6a9f5a907d7e665
 +	* 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.
 +	+ commit a15ed5a1fd5307b3ec1822daf3b138b187db0b5e
 +	* 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.
 +	+ commit 8b3d0d1a36cab83dafb98ccb7895144edb95e298
 +	* common/sysutils.c (gnupg_inotify_has_name): Use void * to stop the
 +	warning.
 +
 +	dirmngr: More ADNS error fix.
 +	+ commit 6f1d8123d61b3efac94b4c61ee75bd947790ba42
 +	* dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
 +	value.
 +
 +	dirmngr: Fix error return for ADNS.
 +	+ commit 8a9341b42cd1891090d45cc068bff84b2b3edb50
 +	* dirmngr/dns-stuff.c (resolve_name_adns): Use RET for return value.
 +
 +	g10: Fix ECDH, clarifying the format.
 +	+ commit ca0ee4e381d0b6a57e4ddc8f4bb2390eb97a2540
 +	* 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.
 +	+ commit 6bbd97d6c771b2e2c7cfcff6d5a823f0fb44d443
 +	* 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.
 +	+ commit b648f28f9f8b889f1217a649ded1d45f261bb2bf
 +	* 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).
 +	+ commit 75f8aaf5bc2dc7fcffe2987a572d489155c91eb9
 +	* 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.
 +	+ commit 6316b28e896957adb76a61a41d2e1c2a08d9f716
 +	* agent/gpg-agent.c (get_socket_name): move to ...
 +	* common/sysutils.c (gnupg_get_socket_name): ... here.
 +
 +	dirmngr: report actual socket name.
 +	+ commit 6bb6ac56cca8135666387a0b9d88dd6b50311418
 +	* 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.
 +	+ commit bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5
 +	* common/sysutils.c (gnupg_inotify_has_name): Take care of the
 +	alignment.
 +
 +	dirmngr: Fix help string and argument.
 +	+ commit 96414baf36b8e6385b71847c789d489ebe176a93
 +	* 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.
 +	+ commit d1ccab5176d7719328b287544b54b85e0277b146
 +	* dirmngr/dirmngr.c (main): Call ldap_wrapper_launch_thread after
 +	thread_init.
 +
 +	agent: Avoid double error message.
 +	+ commit b77f95a4a675fd20f6eeb611f4e7b519eceb4ad3
 +	* agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
 +	Remove unneeded diagnostic.
 +
 +	common: Use GPG_ERR_INV_VALUE instead of GPG_ERR_EINVAL.
 +	+ commit ece13f177d948013b6f3df926406c0cd947abc25
 +	* 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.
 +	+ commit 21b318452abbfe21c45c2a67dae0e3a81cff1090
 +	* 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.
 +	+ commit 27f6d5b9f4b6057ddeb9ace87a1e7e61ebac63e6
 +	* 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.
 +	+ commit 3b5f5e0eb02ecbdcf59722755f22a9d2f88de6e6
 +	* 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.
 +	+ commit 852b8f0b89d447536dfdf6cd4ea91615c75491ce
 +	* 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.
 +	+ commit f88f11a25665dca7490a09088aa24edf396e4c40
 +	* 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.
 +	+ commit b120f358c25cc846ca9d841d47e71ca1a7fe02e4
 +	* 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.
 +	+ commit 7983f8758703071710c11bf2a255efcd71836b65
 +	* 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.
 +	+ commit 9d6146d6f9870fbfcec15cdc4becaf094d5a90e0
 +	* 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.
 +	+ commit 8c40b3b98d3ddeda79fde981e6539c5b3b09d9a2
 +	* agent/findkey.c (agent_write_private_key): Avoid label name error.
 +
 +	agent: Slightly change structure of cmd_readkey.
 +	+ commit fdb653a33ea1a24d1159880624dbbcc0867865b5
 +	* 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.
 +	+ commit 5e7dfd979d2d91800d90c3ce9a66755df3217682
 +	* 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.
 +	+ commit b1828c17fc475def1ee9e06f083f513f568c241b
 +	* 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.
 +	+ commit 945e7ab0ddedf5f58afd97d81e101939de5b5d89
 +	* common/openpgp-oid.c (openpgp_is_curve_supported): Support both of
 +	canonical name of the curve and alias.
 +
 +	g10: Fix card keygen for decryption.
 +	+ commit acef0951646b47c87ccc1c616f0105a068e7ed86
 +	* g10/keygen.c (do_generate_keypair): Fix arguments.
 +
 +2016-10-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: More card key generation change.
 +	+ commit 987bbb2276aeb6bee2793e8406e223717b605009
 +	* 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.
 +	+ commit f7e50634be71ce3028726f23edf14454109a04a8
 +	* 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.
 +	+ commit d2653b1a6db90aed073194a51fd61023d69773ec
 +	* 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.
 +	+ commit 693e657ff04756737dce025203c0deba480ea8de
 +	* 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.
 +	+ commit dafce6f698bec6e9d4c0125b90754d0687294e86
 +	* 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.
 +	+ commit 161cb22f13bcd8cbdb08558d9926b2168a8297ac
 +	* 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.
 +	+ commit 6e85ac77af594035137950d801d8a1bacce548a3
 +	* 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.
 +	+ commit 1ffd475f99eaff4e40950eda88702f8db9288eb5
 +	* 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.
 +	+ commit 71158d8d5f823888abc8588caa6497860ce59c06
 +	* tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary
 +	home directory, just make the uids unique.
 +
 +	tests: Flush stdout in the fake pinentry.
 +	+ commit ca9597f080f70a8435daaeb5449bef0462a1402a
 +	* tests/openpgp/fake-pinentry.c (reply): Flush stdout.
 +
 +	common,w32: Fix setting environment variables on Windows.
 +	+ commit 8c7c4faf3de28ca70a60e6b15f51c1b206e0ddd9
 +	* 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.
 +	+ commit bf37916a23bd0929fc4a5f28c9a41f43c5a473f6
 +	* tests/openpgp/issue2015.scm: Rstrip line before comparison.
 +
 +	tests: Create and remove socket directories.
 +	+ commit 2d794779e0fd9d9a1efc98e7bd77a296a25f4293
 +	* 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.
 +	+ commit 9a34e2142b426b98c73fd888102ea1596bbce62a
 +	* 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.
 +	+ commit b680f79cc112c4831293e259d7db2921bcd783a4
 +	* 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.
 +	+ commit 980c037bedb968ddf155dd334c0a70b918a17759
 +	* 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.
 +	+ commit 82cbab906a3e72a98fdc16096f2f0451465969a2
 +	* 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.
 +	+ commit 72a99f582dad4cb4c3b05b97c7ebb8d537f10b79
 +	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.
 +	+ commit 8dce5ee55a0268d196023224dcf3020306922490
 +	* 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.
 +	+ commit 05a1e412332dd980353a4e3e59bc75ba40bae7fc
 +	* common/exechelp-w32.c (gnupg_spawn_process): Open streams in
 +	non-blocking mode if requested.
 +
 +	common,w32: Extend gnupg_create_inbound_pipe et al.
 +	+ commit f2d39a6d051413289c717b9cd2dc387a270b8e7c
 +	* 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.
 +
 +	common,w32: Make use of default_errsource in exechelp.
 +	+ commit 727ca74bb942464217e678012cccbfc347ae08a5
 +	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
 +	Use them instead of gpg_error and gpg_error_from_syserror.
 +
 +2016-10-18  NIIBE Yutaka  <gniibe at fsij.org>
 +	    Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
 +
 +	scd: Support ECC key generation.
 +	+ commit 34439da2d62b964a914ace66bae7e38f619582a4
 +	* 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.
 +	+ commit f1845f25dbea79c191427710fa56ed01e63a045b
 +	* 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.
 +	+ commit c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794
 +	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
 +	stack.
 +
 +2016-10-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	doc: Document how to manually shut down gpg-agent.
 +	+ commit 869c06efa791bbc8330becdb3f13f7cf9506257e
 +	* 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.
 +	+ commit c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2
 +	* 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.
 +	+ commit 25428be52168fa9c581b7f11c95a5c63b25343b7
 +	* 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.
 +	+ commit 70a8584ec4389209762eb65bb77f20f7881577be
 +	* 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.
 +	+ commit 0b0f9a3788cb5d3c26cec16cd24acc973069d280
 +	* 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.
 +	+ commit 2f7d4c38c9e7bcc14e6e0bf219d688c40a4afecb
 +	* 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.
 +	+ commit c318561ef4c97f0c2767aef377531d58174060a1
 +	MinGW on debian does not support mkstemp.
 +
 +	dirmngr: add VERSIONCHECK command.
 +	+ commit f99c5fa1c970dc1122ac62371eb8d758f380ed57
 +	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.
 +	+ commit 0c56ad5a8d89d69a9ed00571720b3b105f955214
 +	* 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.
 +	+ commit 95d0f3e5eebd85dcf226dca14891a1215bfe93ae
 +	* 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.
 +	+ commit d2d936fbe86d61b89cead95df633b2b575690e05
 +	* tests/openpgp/Makefile.am (TEST_FILES): Add new test data.
 +
 +	g10: Be more careful when checking cross signatures.
 +	+ commit 4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c
 +	* 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.
 +	+ commit e09166c77273f459c8f87cab9224f85808af2cba
 +	* 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
 +	+ commit 5bf92e51dfdfb4f4746ecd817d8d2240ed27ea74
 +	* 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.
 +	+ commit 2282c3b761413dfa894300e70084bbd58908c0b1
 +	* 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.
 +	+ commit 3ad17e72fa81d18c95732ddcd4def244f52bb5b1
 +	* g10/tofu.c (record_binding): Take an additional argument, CONFLICT.
 +	Set the binding's conflict accordingly.  Update callers.
 +
 +	g10: Make a singular string singular.
 +	+ commit ca84f65c7cf2c6a08a01018519965a82e6c52cac
 +	* g10/tofu.c (ask_about_binding): Make the singular string singular.
 +
 +	g10: Correctly determine whether a binding has a conflict.
 +	+ commit 6fdf37f0831949cb279de6dc6b247ab2ed53fe5a
 +	* 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.
 +	+ commit 78eda335fd1c29038b74b9cc912b6a4515fccd9f
 +	* 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.
 +	+ commit cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26
 +	* 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.
 +	+ commit 1f76f8d8bc65fad98927c977baf4d5e36dafe52b
 +	* 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.
 +	+ commit 11eac7eb2fa3392a9aa052f8f5bb9875129ab84b
 +	* tests/gpgscm/t-child.c: Print large amounts of data.
 +	* tests/gpgscm/t-child.scm: Test that this works.
 +
 +	gpgscm: Improve path handling.
 +	+ commit dff266059813d22d1e2ba7e77279999cd41ceb75
 +	* 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.
 +	+ commit 5afbfdfd59540cb882d891ff1f4afa73fe48f99a
 +	* 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.
 +	+ commit fb3b3e1e7a4219f61a834fd07809898918611c2f
 +	* 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.
 +	+ commit 5d43d28aa3c44c3a27fde823f467b0c4be1a58c2
 +	* 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.
 +	+ commit fc0b392e766af8127094e8b529d25abb84ad1d65
 +	* 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.
 +	+ commit 4aadc751f201f8f97c9c1f454e3a29803cce3edb
 +	* common/gettime.c (rfctimestamp): Use indexing instead.
 +	* common/signal.c (got_fatal_signal): Likewise.
 +
 +	g10: Fix singular term.
 +	+ commit b0d2526bc4e5c663eeffe04500420c70cee98712
 +	* g10/tofu.c (ask_about_binding): Fix singular message.
 +
 +	g10: Use appropriate variant of 'abs'.
 +	+ commit 73000d1ce0317210f5a9e5262404cc90258041ff
 +	* g10/tofu.c (ask_about_binding): Use 'labs' instead of 'abs'.
 +
 +	sm: Remove statement without effect.
 +	+ commit 2d446759bd43ae38fbce9a18c955285ca535bc08
 +	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Remove statement without
 +	effect.
 +
 +	g10: Fix testing for debug flag.
 +	+ commit 6b626824c8e30b41c47724b5ccbf761937499512
 +	* g10/parse-packet.c (set_packet_list_mode): Fix testing for debug
 +	flag.
 +
 +	tools: Improve error handling.
 +	+ commit 32f81f56a8be6d13dea0a64d24f52343c7e72c84
 +	* tools/gpg-wks-server.c (copy_key_as_binary): Initialize 'argv'.
 +
 +	gpgscm: Update callsite of 'gnupg_spawn_process'.
 +	+ commit 07cfb3b27a77491eae818d57f6eb660e75fa013f
 +	* tests/gpgscm/ffi.c (do_spawn_process): Adapt to the changes to
 +	'gnupg_spawn_process'.
 +
 +2016-10-05  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Send key encrypted as required by draft -02.
 +	+ commit 8ce800d21919eaaba7ed4f04f712292be310fd66
 +	* 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.
 +	+ commit e514a5b725f0c997cef4362808b2778a3faa9cf8
 +	* 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.
 +	+ commit 1cedc32c95c2e3c3ab98af23ddc2845d51e596c1
 +	* agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
 +	Provide correct fd in the second error case.
 +
 +	agent: Fix npth + supervised mode problem.
 +	+ commit f57dc2b1e6f28d164f882373535dbcb0d632ca17
 +	* 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.
 +	+ commit a2127c71dbf87c1710b43d91a733dd4c9b2953bc
 +	* 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.
 +	+ commit 1a9c8d78ece2f31fdb1a8e2be049aa71053061fa
 +	* 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.
 +	+ commit afcfae7959f39e7d85309b9496e1f1cf9acd5cc2
 +	* 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.
 +	+ commit dc059af1ff007842e2633e686c87d05daf1d45e3
 +	* 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).
 +	+ commit 9f92b62a51d2d60f038fdbe01602865c5933fa95
 +	* 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.
 +	+ commit 4a232d23a8f51bebf9ee382e480248b4bde30f28
 +	* 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.
 +	+ commit 41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b
 +	* tests/gpgscm/ffi.c (do_glob): Remove function.
 +	(ffi_init): Likewise.
 +
 +	tests,w32: Avoid using 'glob'.
 +	+ commit 949e70115eb2c04bd09da6477f6c433e6fd9a366
 +	* tests/openpgp/setup.scm: Avoid 'glob' which is not available on
 +	mingw.
 +
 +	tools: Ignore existing directories in gpgtar.
 +	+ commit fbc83c0cdd390473c044953fb774571ffc636c6d
 +	* 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.
 +	+ commit eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d
 +	* 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.
 +	+ commit a43739a2456a38c01704d8a52dca441055e29bc6
 +	* g10/call-agent.c (check_hijacking): Remove.
 +	(start_agent): Remove call.
 +
 +	agent: Create the extra sockets in the standard socket dir.
 +	+ commit 80cc16e0728256f6b07a12980e1f3512cf2324fa
 +	* 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.
 +	+ commit 95cf7afff074613825f4442fa131145a2c0d3cf7
 +	* agent/gpg-agent.c (main): Check for special socket names.
 +
 +	wks: Avoid long trustdb checks.
 +	+ commit de67055aff916455cec89fab1d95177d3b383008
 +	* tools/wks-receive.c (verify_signature): Use --always-trust.
 +
 +2016-09-30  Justus Winter  <justus at g10code.com>
 +
 +	build: Fix build against libiconv.
 +	+ commit 6054e8aaecbd355bb7559697eecaadf2225189b8
 +	* agent/Makefile.am: Add INCICONV and LIBICONV.
 +	* common/Makefile.am: Likewise.
 +	* tools/Makefile.am: Likewise.
 +
 +	agent: Enable restricted, browser, and ssh socket by default.
 +	+ commit e11686f973b35869d7b299ce4726003ac22e2e3a
 +	* 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.
 +	+ commit 8d37018050373a47566bf8ea0d894da20ed292c7
 +	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix build against
 +	<winldap.h>.
 +
 +2016-09-29  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Partly implement draft-koch-openpgp-webkey-service-02.
 +	+ commit 33800280da55a859e08dfa57f29144c89dd1bead
 +	* 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.
 +	+ commit c738f92c195d91662ddc7848cc3c92c7f091f1f8
 +	* 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.
 +	+ commit f776757ea94542e2f425840dddaf3e65b0ff7757
 +	* tools/mime-maker.c (find_part): New.
 +	(mime_maker_get_part): New.
 +
 +	tools: Change mime-maker to write out CR,LF.
 +	+ commit 29db3be6e8dbc9b4dd52cd1781106fa9fa3954a5
 +	* 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.
 +	+ commit 95d60c6ce9e8a7a7741553af957978c1f91547c5
 +	* 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.
 +	+ commit 4ac138c84d0f344ca9442f90c96f0e1f76062a4a
 +	* 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.
 +	+ commit 9e6f8a55ed04f876635792125858ee76a948802a
 +	* 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.
 +	+ commit cbf2ac66692daa7a324108724698d60d6c7e473f
 +	* 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.
 +	+ commit 80393661bdfa7ae0288644513575e8a5d708b084
 +	* g10/import.c (any_uid_left): New.
 +	(import_one): Check that a UID is left.
 +
 +	gpg: Make import filter data object more flexible.
 +	+ commit c9237bf2ba2c49588576dcece756ebf5fe89aada
 +	* 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.
 +	+ commit 829949f3823c2306022928ce782f9c9d9c5f1cc8
 +	* 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.
 +	+ commit 20a16833ee2bb05f735377f705899302bcf2b4d3
 +	* tools/Makefile.am: Do not link gpg-connect-agent against npth.
 +
 +	build: Fix check for resolver library on macOS.
 +	+ commit 2e64ccb0f96d615b1eb87e37f230a5d761aa9c36
 +	* configure.ac: Check for the mangled name of 'dn_skipname' first.
 +
 +	common: Correctly handle modules relying on npth.
 +	+ commit 2b23a321ac0b07beeac1dfa8d71f223e66c49b71
 +	* 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.
 +	+ commit 4e4843e735f32b5e79a51d8062da55bfaab6ad77
 +	* 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.
 +	+ commit 836b72363168cbb0051fc2356f61788468db211c
 +	* dirmngr/Makefile.am (dirmngr_ldap_LDADD): Remove no-libgcrypt.o.
 +
 +	agent: Allow only specific digest size for ECDSA.
 +	+ commit 98bc6f480ac973dccce90378dc021a2e24e58704
 +	* 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.
 +	+ commit df5353b95eefc13135e7df50a7c197f270d6080d
 +	* 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.
 +	+ commit 7e0379a75475abfd15e0623913795779ff0f40d7
 +	* 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.
 +	+ commit 6c4c0e3ac2aeafba7a2b7c2dd92a18be8aec92b1
 +	* 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.
 +	+ commit 49fae88fd170f2bdc12a1794a2637260e3c73a73
 +	* tests/openpgp/run-tests.scm: Drop hardcoded list.
 +
 +	tests: Reduce runtime of excessive test.
 +	+ commit 988a04b98d42ff9cc9e62007ebcc0e4c03f4047d
 +	* tests/openpgp/conventional-mdc.scm: Use only two plaintexts when
 +	iterating over all cipher algorithms.
 +
 +	dirmngr: Fix type.
 +	+ commit 285d193f1e1464495bce57bd0f323468515b4513
 +	* 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.
 +	+ commit 4644c27514f34f5efc555d43672a25088a611a72
 +	* 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.
 +	+ commit b9b4ff857034df51e055ceddce567ca97e94e075
 +
 +
 +2016-09-20  Ineiev  <ineiev at gnu.org>
 +
 +	doc: Do not end section names with "."
 +	+ commit 8078d8246fa38c3e478fc9a542117468780ace00
 +
 +
 +2016-09-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	doc: minor fix for @xref.
 +	+ commit 9c1b3bc25a1b38c4eda31bf12ccc10d94bb05212
 +	* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
 +
 +2016-09-20  Justus Winter  <justus at g10code.com>
 +
 +	doc: Implement simple '@ref'erences.
 +	+ commit 91d5e6f805aaf24a3f1f03a95998f757dce04cb2
 +	* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
 +
 +2016-09-20  Ineiev  <ineiev at gnu.org>
 +
 +	doc: Fix full stops.
 +	+ commit 0eaab1af48f600b636183321e4a4e9c6bc361610
 +	* 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.
 +	+ commit 32bcf8b73ede9c8f1469821a54dedc6be75241d2
 +	* doc/debugging.texi, doc/dirmngr.texi, doc/gpg-agent.texi,
 +	doc/gpg.texi, doc/tools.texi: Fix.
 +
 +	doc: Improve markup.
 +	+ commit 377624207e9b2895ce00dfc4d1163d72f349841f
 +	* 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.
 +	+ commit 9d2b7bff12b268638465da222ca7cc9042bba072
 +	* doc/gpg.texi, doc/gpgsm.texi, doc/specify-user-id.texi: Fix.
 +
 +	doc: Add missing description of datafile.
 +	+ commit 789916281c25e737d8fb44add5ca61f8fd25de2f
 +	* doc/gpg.texi: Fix.
 +
 +	doc: Replace UTF8 with UTF-8.
 +	+ commit 00d6d8bc8772e48b6f200d359e11eb93ab65f51f
 +	* doc/gpg.texi: Fix.
 +
 +	doc: Fix mistakes.
 +	+ commit f25e04005af5831053ba194a09e3afa48d1e162b
 +	* 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.
 +	+ commit 825c1dfb3ee4c1704f42eaf064161b9731c20134
 +	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
 +	doc/tools.texi: Fix.
 +
 +	doc: Use the right reference commands.
 +	+ commit f32689f833838a742243e94c900e98f5b59a5811
 +	* 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".
 +	+ commit 20a27d8a57c4c990fcada4278a1ce2e6fc9043e9
 +	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
 +	doc/scdaemon.texi, doc/tools.texi: Fix.
 +
 +	doc: Fix typos.
 +	+ commit fa346508fe323e61cf157ee30c13301e1d2117c0
 +	* 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.
 +	+ commit 858af2b3473e436af53470d53cdac334edce9f09
 +	* doc/contrib.texi: Fix.
 +
 +2016-09-19  Justus Winter  <justus at g10code.com>
 +
 +	tests: Refine the repl function.
 +	+ commit 884e78efe1f3ba50513bf81c8b4804d22b25eac4
 +	* tests/gpgscm/repl.scm (repl): Add an argument 'environment'.
 +	(interactive-repl): Add an optional argument 'environment'.
 +
 +	tests: Implement interpreter shutdown using exceptions.
 +	+ commit 9a0659a65c52378de1c4736a0eddf8518eb20948
 +	* 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.
 +	+ commit 58007e52593e6b0f838de2e464ceeacf22757018
 +	* 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.
 +	+ commit ab483eff9a8254adf127cdee178e14ba74f0a2b3
 +	* 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.
 +	+ commit 83a406b38a21d0eeb4963db824a27783c212d2fb
 +	* 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.
 +	+ commit 998643666c016dbacf10f813c22efc97deadec65
 +	* g10/keylist.c (list_keyblock_print): Do not depend calling
 +	print_fingerprint on opt.keyid_format.
 +
 +	dirmngr: Silence diagnostics about starting housekeeping.
 +	+ commit 5bf1facc973eb6e0bfab0f8f17129534dec56e04
 +	* 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.
 +	+ commit 086d219d96caa3501048aff82a282481e07c195b
 +	* g10/tofu.c (build_conflict_set): Free 'kb_all'.
 +
 +2016-09-19  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Update license information.
 +	+ commit 3899041cd2877ce9584c7bd149f232f35a07c399
 +	* 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.
 +	+ commit 47baeac50ccaaf06dc8b0cebece50f47754de6ca
 +	* tests/gpgscm/main.c (main): Check against required and not installed
 +	version.
 +
 +	gpg: Avoid malloc failure due to no key signatures.
 +	+ commit 18bbefa27f9e47e1062ee4d7af09487632795ba7
 +	* 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.
 +	+ commit 7305d27f36148a7fb8c2f4ef5b94774cbd21b18e
 +	* 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.
 +	+ commit 0d67241e317b172a258a910c02d90639e2b08fce
 +	* 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.
 +	+ commit 215180d1ce6c93e2b4969d746c83ac4c055d25ef
 +	* 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.
 +	+ commit 6e930f0e4077bc7aa3d28b1ba649a82d62427d87
 +	* g10/tofu.c (tofu_register_encryption): If get_trust fails, set RC.
 +
 +	g10: Don't ignore failure.  On failure, rollback.
 +	+ commit 221b0bd0e5946edaea7135bc3b6f3c5c0fc6dbca
 +	* 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.
 +	+ commit c2e563421e4fd4f0910642aa7b171bcf0b374b01
 +	* 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.
 +	+ commit af196342bf44ce6dc42111d37539dec7ee3b3d82
 +	* 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.
 +	+ commit 4ab8107063b641ed74fc4c9bf98304bcea573178
 +	* 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.
 +	+ commit dd06d33655bc872a6310edac8e448419479d3312
 +	* 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.
 +	+ commit c0e620cee86b5dacc941964bd187bba0dfa90eea
 +	* 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.
 +	+ commit 3f7f7447316f57d002d683af4ad30ac5730b9ebe
 +	* 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.
 +	+ commit dcc64663051f8af82abc11e2699649c3b35936db
 +	* 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.
 +	+ commit 3248182d1b5a03098ee797c980fa0f0ec06e716f
 +	* 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.
 +	+ commit 167273ee9d3c04f29835aa2d12fde52eebf61efb
 +	* dirmngr/server.c, sm/server.c: s/conenction/connection/
 +
 +	spelling: correct achived to achieved.
 +	+ commit 7fafc3c49901c118b47d4d13a41fb3575c1f9e4b
 +
 +
 +2016-09-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	tests/gpgscm: Fix use of pointer.
 +	+ commit 68eb5fbd37c31ed7c0c916656131eea7bb58d13d
 +	* 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.
 +	+ commit 9799b5d18f8fd29872b75c4d70d370af2b4e9a89
 +	* g10/tofu.c (show_statistics): Fix whitespace.
 +
 +	g10: Correctly compute the euclidean distance.
 +	+ commit 05b2b13efd8ecea86d31af863cbf82c8b38dc94f
 +	* g10/tofu.c (write_stats_status): Correctly compute the euclidean
 +	distance.
 +	(show_statistics): Likewise.
 +
 +	g10: Change the default TOFU policy for UTKs to good.
 +	+ commit ca91caabb5798f67c69ee96657c7cb402e7db0df
 +	* g10/tofu.c (get_trust): Change the default TOFU policy for UTKs to
 +	good.
 +
 +	g10: Add missing static qualifier.
 +	+ commit 9d62b79e62ef2690e6522fe1621140fbfc10695c
 +	* g10/tofu.c (cross_sigs): Add missing static qualifier.
 +
 +	g10: Default to the "good" TOFU policy for keys signed by a UTK.
 +	+ commit 8df8aa13c795e400324a782fbaea578c8f2a1398
 +	* 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.
 +	+ commit f4e11f2e9e8f58fd5f0df3148e6d7ccef0f84232
 +	* g10/keyedit.c (menu_adduid): Emit an ERROR status for an existsing
 +	user id.
 +
 +	gpg: Allow use of "default" algo for--quick-addkey.
 +	+ commit 0fd332bc1f6f1f10c96da0cc91203925d3ac81eb
 +	* 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.
 +	+ commit 30a011cfd6ec172cc460e59f0904a26fe2d68632
 +	* 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.
 +	+ commit 31fc420727f45dd081f8ad5d056da6675dad29f2
 +	* 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.
 +	+ commit aa81e32df7189c3eb44d4c602fd63f5b3f6a9e49
 +	* 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.
 +	+ commit eddcba038025cdbd58aaf67cafd6d83f0ea042d5
 +	* kbx/Makefile.am: Add NETLIBS.
 +	* dirmngr/Makefile.am: Ditto for dirmngr_ldap.
 +
 +	Fix symbol conflict.
 +	+ commit 937ec53eff290c3d916faebc23218c9272671c02
 +	* 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.
 +	+ commit d757009a24eb856770fc3a3729e2f21f54d2a618
 +	* 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.
 +	+ commit 30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a
 +	* g10/gpgv.c (opts): Remove --yes.
 +	(main): Always set opt.ANSWER_YES.
 +
 +	gpg: Add options --output and --yes to gpgv.
 +	+ commit a8363b7d0bcc77b55226d5fe8f972214c968ddc3
 +	* g10/gpgv.c (oOutput, oAnswerYes): New.
 +	(opts): Add --output and --yes.
 +	(main): Implement options.
 +
 +	gpg: Make --output work with --verify.
 +	+ commit bbe940c095f2bca7a1ca5f8e68ca1af98350a885
 +	* 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).
 +	+ commit 6308c300196ae85fd82ed383217219e0206640a4
 +	* 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
 +	+ commit bde29a46cedbbd2a5dfe7c91a6277c0a4ff50825
 +	* 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.
 +	+ commit a937eef2d4e80cd43095802176d3db5e7fd94008
 +	* tests/openpgp/tofu.scm: Remove use of --tofu-db-format, which is
 +	deprecated.
 +
 +	g10: Check for a new binding a bit later.
 +	+ commit ee06b3f7889bd99c28ac68f4781bda77d67eed00
 +	* 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.
 +	+ commit 7b3e8572e3bb8a65d20577a48009251fdc7b1910
 +	* 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.
 +	+ commit 56c18408d4955713d9c4e634367c7912d6564651
 +	* 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.
 +	+ commit 97a67d42dc946b2d6ed81723d86e37002b5931b3
 +	* 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.
 +	+ commit 13ddc17ddb266d74033d5739fec932034fa85c72
 +	* g10/tofu.c (get_trust): Make sure the caller provides a primary key.
 +	(tofu_register_signature): Likewise.
 +
 +	g10: Tweak TOFU's verbosity.
 +	+ commit ee19eacd1d688d3a98cd66e5ef2f42079eb829f1
 +	* 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.
 +	+ commit 67cef405cbfad2e53fc388dd6591ee4f7cb0d973
 +	* 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.
 +	+ commit 875ac9216f1383851a82bd240cadb17c7112f6a8
 +	* 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.
 +	+ commit a9e6db6c7e23d9f4b8de59f5cabbf9eb6a59e626
 +	* g10/tofu.c (ask_about_binding): Simplify binding statistics.
 +
 +2016-09-06  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix detection of unbalanced parenthesis.
 +	+ commit f2249b737055f84842778285bbeff5e61fa55225
 +	* tests/gpgscm/main.c (load): Print error message.
 +	* tests/gpgscm/scheme.c (opexe_0): Correctly report nesting level when
 +	loading files.
 +
 +	tests: Fix test.
 +	+ commit 213b3cf465fb091dc0a205d1a08b88b950ffb85f
 +	* 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).
 +	+ commit 650356148af43ea619bec12e599a4981b147d5f8
 +	* 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.
 +	+ commit 46c4333c372f0e1ad2aadc411490c2a330b4c5a6
 +	* 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'.
 +	+ commit c97bde2dfeab23a84b4788d998934ac49ff5b797
 +	* common/exechelp-posix.c (gnupg_wait_process): Use the code prior to
 +	5ba4f604.
 +
 +	common: Fix error handling.
 +	+ commit 845e2cc201d6a2cdb151e39e29516d26cb49311c
 +	* 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.
 +	+ commit 9082bde01cc18e32504ce39d55ea6dd3c05dddec
 +	* 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.
 +	+ commit 0b99d1fd2a80b8efaacc731027d2b2ecd9eca699
 +	* 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.
 +	+ commit 2eeb5551c37659fdd59e8537fc77a9e7fb6a9204
 +	* 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.
 +	+ commit 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de
 +	* 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.
 +	+ commit 65a7563edbbab8f93fe901f932065687508788de
 +	* tests/openpgp/README: Update.
 +
 +	tests: Pass flags to test driver.
 +	+ commit 059c79d8b447a3baa9ad0b4d3367bdb64dd2ef3b
 +	* tests/openpgp/Makefile.am (xcheck): Pass flags to 'run-tests.scm'.
 +
 +	common: Improve waiting for processes on POSIX.
 +	+ commit e33111fcdac08ed2ddfbdf59b1f790569b42f695
 +	* 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.
 +	+ commit de623474db3ba402c9bbd872ab6f932f46cbdde9
 +	* 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.
 +	+ commit 0ac671f8a2b65a4b339f615c6420287a549779fa
 +	* 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.
 +	+ commit 0a4a03e5310946b0866a0f6a34031eda7a240162
 +	* 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.
 +	+ commit 959cd8903fd012e63dbb156db56708dd3934b5df
 +	* 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.
 +	+ commit c8e0d37f4152d1341ef562a190fce93a0386a759
 +	* 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.
 +	+ commit f9e49c80e706a27d5e30d4b3237ff26367a67130
 +	* 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.
 +	+ commit 46362cbc0e2260e989820795a6e4245c72335172
 +	* 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.
 +	+ commit 505ee45106d6aa2902bbdd6326f8eb7527c273c4
 +	* dirmngr/server.c (cmd_wkd_get): Add new option.
 +
 +	common: Check read errors in name-value.c.
 +	+ commit fc445b36fafc8a4cc3ce5a675ac42df7a9d9a02a
 +	* 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.
 +	+ commit 8fe81055762d9c9e6f03fb7853a985c94ef73ac3
 +	* scd/command.c (update_reader_status_file): Call apdu_close_reader.
 +
 +	scd: Clean up unused shutdown method.
 +	+ commit d1ae7103352fbda2a05f098379cd3043a0ab5566
 +	* 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.
 +	+ commit 8b6c0bae33bdc36892f4595806665ce61f77dfd2
 +	* agent/call-scd.c (start_scd): Supply --homedir option when it's not
 +	default homedir.
 +
 +	po: Update Japanese translation.
 +	+ commit afdfc954b35370fbf03aaf8dc0e496410923aa4e
 +
 +
 +2016-09-01  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: End transaction earlier.
 +	+ commit 85fad6c34c08b2850580e0644faba62d3a501b84
 +	* g10/tofu.c (ask_about_binding): End the transaction earlier.
 +
 +	g10: Don't consider cross-signed keys to be in conflict.
 +	+ commit b410a3cb7683fc7c2a253e23130c44df42a6203c
 +	* 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.
 +	+ commit 38d369de13acb95208a0ed8d1cf82ac19173688f
 +	* g10/gpg.c (main): Do not register a key for the list config
 +	commands.
 +
 +	gpg: Simplify code to print VALIDSIG.
 +	+ commit fde9fa81d3d3b25a929b532cc1960d9d9f454a0c
 +	* g10/mainproc.c (check_sig_and_print): Use hexfingerprint and
 +	write_status_printf.
 +
 +	gpg: Add new function write_status_printf.
 +	+ commit 6bdadae00512b4907826f6754cdb220d06e1ac6d
 +	* g10/cpr.c (write_status_printf): New.
 +
 +	gpg: Fix printing of pubkey algo in --verbose signature verify.
 +	+ commit 37e3c897252babc203447be9d2f286a4507875ad
 +	* 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.
 +	+ commit 3d44e5e8a8d1d8bf6cf5d387f50d75f84d804412
 +	* g10/tofu.c (ask_about_binding): Default to unknown.
 +
 +	g10: Add support for TRUST_NEVER.
 +	+ commit f2e5cb6ffb55e49a05d452cd85e45f6f67c20abb
 +	* 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.
 +	+ commit 0cb0ea1633955fb7acd33fe993a4ae4e96e83ae3
 +	* g10/tofu.c (show_statistics): Improve the text (key and user id, not
 +	just key).
 +
 +	g10: Remove unused parameter.
 +	+ commit 00c2850393ecc320f591f511c3534286964780c2
 +	* 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.
 +	+ commit 3e67b50490aef087b5769bb35145d23f6657780f
 +	* 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.
 +	+ commit 4cbd2a690c5e5ed2dff49c1f4fc867b31fca689a
 +	* 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.
 +	+ commit babeb6f8a9b1f8341652145bad58be6cd49e0712
 +	* 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.
 +	+ commit 04c042f3f2a631bc6e772c33f8da5e7aa7b1902a
 +	* tools/gpg-wks-server.c (send_congratulation_message): New.
 +	(check_and_publish): Call it.
 +
 +	wks: Relax permission check for the top directory.
 +	+ commit e4eac16330449f3893c11820c15e07d58fb807ff
 +	* 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.
 +	+ commit edfb6934caf16c6afcfd82d684d8ae9c79674d10
 +	* 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.
 +	+ commit b69b2cb082e39a7eb56082fa80219f6f14fbd2b4
 +	* doc/help.txt (.gpg.tofu.conflict): New help text.
 +
 +	g10: Always trust ultimately trusted keys.
 +	+ commit 28c235ae757e9036b0b96efc28931fa5cc74f7ee
 +	* g10/tofu.c (get_trust): Always return TRUST_ULTIMATE for ultimately
 +	trusted keys.
 +
 +	g10: Fix error detection.
 +	+ commit 5b48960a8a2555db7bf992261de9e922838c9913
 +	* g10/tofu.c: first_seen == 0 is not an error.
 +
 +	g10: Update a key's TOFU policy in a transaction.
 +	+ commit e4d5e3cb0d10e8f77c7100d42cfdb32051de1c18
 +	* 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.
 +	+ commit 247eef005cf4c34e9a82227e4ab7823e04911be4
 +	* g10/tofu.c (record_binding): Fix the show old policy functionality.
 +
 +	g10: Drop unused argument.
 +	+ commit 70df5a8fd781d8774d835384ca28c4d8518bb9d0
 +	* g10/tofu.c (begin_transaction): Remove unused option only_batch.
 +
 +	gpg: Move state local to tofu.c to a private structure.
 +	+ commit 268f6b7a3403d036882b4af384ba7ab2f8c8355f
 +	* 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).
 +	+ commit b8184d2d74e5ddd5eb68836b53fe5568110e14dd
 +	* 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.
 +	+ commit 76304a971fe507ea659b952932ea899463ab7166
 +	* 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.
 +	+ commit 371ae66e9d5c7524431773c4a479fcae1ea3b652
 +	* 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.
 +	+ commit d0451440c036106895a291f9ca1c53c2d5159f8f
 +	* 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.
 +	+ commit 6052c147091935fc0321ba24f4a44146df70ef01
 +	* 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.
 +	+ commit 33e97813d72996d22a295773c64261f5588ce9dd
 +	* 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.
 +	+ commit 4c2abb221b29c9e8e0876fe986472b562ee1c99f
 +	* 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.
 +	+ commit 0858f141a8b8d0c098a0c6097176b7225c4a9db8
 +	* 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.
 +	+ commit 8dda861ad80228da76cd5c97467008c87b8b6eee
 +	* 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.
 +	+ commit 8b3e691ffbaaa218d309d5aaf8f37532308558ff
 +	* common/logging.c (fun_writer): Always declare 'name_for_err'.
 +
 +	gpgconf: Print the plain socket directory with --list-dirs.
 +	+ commit 8e3fa5a4b205c534de2142e5d071712f957cf06a
 +	* tools/gpgconf.c (list_dirs): Add plain socketdir out.
 +
 +	common: Add a default socket name feature.
 +	+ commit 2aa0701013f703ad93e17da3345c493c08aa04ee
 +	* 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.
 +	+ commit bdbd03608b6f508ac4732f9986a046de8a85a311
 +	* 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.
 +	+ commit 0a5a854510fda6e6990938a3fca424df868fe676
 +	* 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.
 +	+ commit 74a082bc10960b2d65d4d1e31152f988a40a2225
 +	* 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.
 +	+ commit 19d12be3cea5b4ee8153287a2f2442913a5e07a1
 +	* 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.
 +	+ commit 0f1f02acc1cdcc2cf74a97b05507bb1f062f8af2
 +	* 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.
 +	+ commit 5eb2682686b32bd82096924eeabd0c5bd347adfd
 +	* 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.
 +	+ commit 460568d341851ac79dd100e00e4eafcac1318148
 +	* 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.
 +	+ commit c47386a11a32c5ed3b5a31fad5c3e9a9a020ca7b
 +	* tools/Makefile.am (bin_PROGRAMS): Move gpg-wks-client to ...
 +	(libexec_PROGRAMS): ...here.
 +
 +	common: Remove unused vars in simple-pwquery.
 +	+ commit 62f3e0027724b23c0de5be6d1e66cfdeef7e7bc9
 +	* 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.
 +	+ commit 6bee88dd067e03e7767ceacf6a849d9ba38cc11d
 +
 +
 +	po: Update German translation.
 +	+ commit 0a32153316855224acda268edb60b80d4e64b12f
 +
 +
 +2016-08-18  Åka Sikrom  <a4 at hush.com>
 +
 +	po: Update Norwegian translation.
 +	+ commit ec88d7c8a9af864fad8ab5e0b9c4eb90ddcdd630
 +
 +
 +2016-08-18  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +	+ commit 6f6bfbf175653faa5cf560a7174e81a599247e80
 +
 +
 +2016-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add import filter "drop-sig".
 +	+ commit 1b55e864421f88b8c8088639682767076abbeab0
 +	* 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.
 +	+ commit d83ba4897bf217d1045c58d1b99e52bd31c58812
 +	* 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.
 +	+ commit de6e3217cde81df370926571e0fd65e468619803
 +	* 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.
 +	+ commit b5d63e81d5c472647decc7687cef91fee0378eb8
 +	* 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.
 +	+ commit f02ceb6c6e94c6fbfaeeafe728397be38107de4d
 +	* g13/mount.c (g13_mount_container): Do not run the first access check
 +	if syshelp is required.
 +
 +	g13: Implement --umount for dm-crypt.
 +	+ commit b781113cf1391926dedf8dc943624d3bb9726318
 +	* 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.
 +	+ commit c9a0bccc77c93c08d6980a1718dfaf238a559eb9
 +	* g13/sh-cmd.c (cmd_mount, cmd_resume): Do not xfree TIUPLES.
 +
 +	g13: Consider g13tab for a mount command.
 +	+ commit 700920640211168ae1c97d0adef74ba8615d90bb
 +	* 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.
 +	+ commit 37e932658cbd873ac96ff7e2067a97dffc2e0507
 +	* 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.
 +	+ commit b57f55321295846d47144bd6b39fbbcac0127421
 +	* 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.
 +	+ commit 3a75ff65fba24ea2d024bd8fef633ab7d8f7d520
 +	* 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.
 +	+ commit 61c2a1fa6d6cb345f9d81f4bdd3f8f8ddac1ea3e
 +	* 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.
 +	+ commit 70b5d7c43a57a44dad60c2c700a263610748d8f4
 +	* 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.
 +	+ commit 0698324cde3e0cef7eeb6cfd1640c5eefdf13698
 +	* 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.
 +	+ commit 72fa314b71e4ce8780f59b16d32cabf5d4bd5451
 +	* common/Makefile.am: Drop deleted files.
 +	* common/w32-afunix.c: Delete file.
 +	* common/w32-afunix.h: Likewise.
 +
 +	common: Rework the simple password query module.
 +	+ commit 14479e2515439c73e385f37e8c2b3fc517b038b9
 +	* 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.
 +	+ commit 9e6503b7ce019aa417099ded1dda87b68c33f912
 +	* 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.
 +	+ commit ed5c1b0b8a4790c4fb36a3129387f7c2ef5db302
 +	* 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.
 +	+ commit f2ea7e539c9a22081e3159dcbca84f57f30724ca
 +	* 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.
 +	+ commit a6acf1f6b39c5a607f61f643a5d21309ba58685d
 +	* tests/openpgp/issue2417.scm: Copy configuration.
 +
 +2016-08-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove tofu database format "split".
 +	+ commit 5b59999ce0dd1650ebe47a74a30ded6af00eeed3
 +	* 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.
 +	+ commit a27410a251cd25ca96cd6743969c4db0a0fd553f
 +	* 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.
 +
 +	tests: Fix distcheck.
 +	+ commit 194b1e979c7c547afd0dfea5b2496bdfa34b20f1
 +	* 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.
 +	+ commit d9240a3a4688c263632b4168ae2e04363bc91a3a
 +	* 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.
 +	+ commit efe973dab7f69e2b1309446b2fbcd47ce0305399
 +	* tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
 +	underscore.
 +
 +	tests: Run each test in a clean environment.
 +	+ commit e13f1ea8fff3964dc3008432f5c0f26aaa2eaa35
 +	* 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.
 +	+ commit b2b21580b68f3a9069562f99675b389a0d044713
 +	* 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.
 +	+ commit f14795d57f6c81709e9225dd3c5dfd3495cf1b2b
 +	* 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.
 +	+ commit e630f904993725c54ec63be00369589b7b7234d2
 +	* agent/command-ssh.c (sexp_key_construct): Lowercase the algo name.
 +
 +	gpg: Extend the PROGRESS line to give the used unit.
 +	+ commit 16feb1e0ea9b5d3966f22f4ae047335b9d1b60e1
 +	* g10/progress.c (write_status_progress): Print the units parameter.
 +
 +2016-08-09  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Cleanup initialization of libgcrypt.
 +	+ commit 49829c29e541546084950b8a153067db371d101a
 +	* 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.
 +	+ commit ebf24e3b29766595204355d82f435a3e675bfbbc
 +	* 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).
 +	+ commit 491d6fdabb3d95905cd96d905e1f965ce8ff07e1
 +	* 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).
 +	+ commit 5b614973fe2d4b5ef402a3057c31c3ef3042a483
 +	* 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.
 +	+ commit 591a8373a5d9567db9b1a1a48205e8a206c7b669
 +	* 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.
 +	+ commit 7dcad0d3503ac0d75e09efb16246dd78518986fc
 +	* 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.
 +	+ commit 40d16029ed8b334c371fa7f24ac762d47302826e
 +	* 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.
 +	+ commit 894789c3299dc47a8c1ccaaa7070382f0fae0262
 +	* 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.
 +	+ commit c9387e41db7520d176edd3d6613b85875bdeb32c
 +	* 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.
 +	+ commit c8cc804f56bfefba46641f2c7078fcd67b494bae
 +	* g10/keylist.c (list_keyblock_colon): Print an emprty grip in case of
 +	an error.
 +
 +	gpg: Always print the fingerprint in colons mode.
 +	+ commit 54a1ed20e203dcafeacbe21eb147efa08255dbf5
 +	* 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.
 +	+ commit 0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c
 +	* tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
 +
 +	gpgconf: Add limited support for -0.
 +	+ commit db6f3eb926619dfe6ed2a9be197c51f9a1b6198c
 +	* 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.
 +	+ commit 05cb30052cdf1d308ff7da901cfa5a809cd49479
 +	* tests/openpgp/run-tests.scm: Add missing tests.
 +
 +	tests: Fix path to fake-pinentry.
 +	+ commit 3566544d04a4b81e5dd8a2883304673b2cc2f108
 +	* tests/openpgp/defs.scm: Correctly compute the path to fake-pinentry.
 +
 +2016-08-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +	+ commit 89234f7f3643bad2daddc94569f1d651ec5c835e
 +
 +
 +	po: update Japanese translation.
 +	+ commit 573e0f36190346e0263bea3ae12a389f4f598d55
 +
 +
 +	g10: Fix checking key for signature validation.
 +	+ commit 6f284e6ed63f514b15fe610f490ffcefc87a2164
 +	* 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.
 +	+ commit e3358b246d9380008a4ba7c8f2fe03659901adaf
 +	* kbx/keybox-update.c: Add missing header file.
 +
 +2016-08-03  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	More cleanup of "allow to".
 +	+ commit dc107b78509807db375d3a382eb3376cd2183357
 +	* 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".
 +	+ commit 436b28c23194fa77919967338d5a61a82d242153
 +	* 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.
 +	+ commit cd45cf782b91ff0f6b023913963e5258ffcbf464
 +	* 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.
 +	+ commit 48a2c93a1886589d1a0e2a4a2173e0e81311200b
 +	* 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.
 +	+ commit 3a2421c94015432caa49e166bc5bf5c4f80ab7c7
 +	* 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.
 +	+ commit 40365b28c3fdf087fd58401f5a6f42f9d7d29d20
 +	* sm/keylist.c (list_cert_colon): Drop superfluous colon.
 +
 +	tests: Distribute standalone test runner.
 +	+ commit c971ff0823d9a649b32fd9f169a12abc3095246e
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Add missing file
 +	'run-tests.scm'.
 +
 +2016-07-28  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix distcheck.
 +	+ commit 9e799b0e4f131126b80a5d3272c36d52b8ba1720
 +	* 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.
 +	+ commit 583a464c62ce8f7d70f5fdab2c7ea73ec3348d69
 +	* configure.ac: Match other Android targets as well.
 +
 +2016-07-26  Justus Winter  <justus at g10code.com>
 +
 +	common: Fix iobuf_peek corner case.
 +	+ commit b2572b0c386fd12ac6581fcce72f8d48cbfd27c7
 +	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.
 +
 +	gpgscm: Do not shadow common function name in catch macro.
 +	+ commit 046338b8494c036a5e717130d3eadce0291126fc
 +	* tests/gpgscm/init.scm (catch): Do not shadow 'exit'.
 +
 +	tests: Fix distcheck.
 +	+ commit 66c0dab3c722c2766828515120775b106286334e
 +	* tests/openpgp/Makefile.am (samplekeys): Add missing key.
 +
 +	gpgscm: Make the verbose setting more useful.
 +	+ commit f17aecbcd98103fcd2ece537be96930f354de656
 +	* 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.
 +	+ commit b3610badf691178bbbf0831af9aa6b6658c1948a
 +	* 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.
 +	+ commit 35132a8b119dbc3393ceb0d0874917905d1a6354
 +	* common/exectool.c (gnupg_exec_tool_stream): Rework error handling.
 +
 +	common: Add unit test for exectool.
 +	+ commit fe40e9c53dc0710ff73e72d05ba8040874465b55
 +	* 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.
 +	+ commit 4ba11251aff578394000bf480f47160f0879c763
 +	'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.
 +
 +2016-07-22  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Make function more general.
 +	+ commit 9ee23a715d5dad6bf568a2deb1c55bf15601cf51
 +	* tests/gpgscm/tests.scm (in-srcdir): Accept more path fragments.
 +
 +	g10: Properly ignore legacy keys in the keyring cache.
 +	+ commit d9839c9d303a01dc1032a6de311e034fe14e81da
 +	* 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.
 +
 +2016-07-21  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix error handling.
 +	+ commit 45bb9a2a46e11bc13c6b39e7b4748b7de199018e
 +	* g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
 +	duration.
 +
 +	g10: Drop superfluous begin transaction.
 +	+ commit 8a6f8e1e397a2d676b211f2dbc6df4a80b67442d
 +	* g10/tofu.c (record_binding): We only need a transaction for the
 +	split format.
 +
 +	gpgscm: Make assert macro more accurate.
 +	+ commit 699c6c9f4b44441ab3db7f942df5b81f4cd88b06
 +	* tests/gpgscm/lib.scm (assert): Print the representation of the
 +	failed expression.
 +
 +	gpgscm: Make error message more useful.
 +	+ commit 7207b2fe45bcf884e029366a2677a570234bed2e
 +	* tests/gpgscm/scheme.c (opexe_0): Include names of missing function
 +	parameters in the error message.
 +
 +	g10: Fix crash.
 +	+ commit 1af2fd44f0a66fd0d94c224319db0b128d42a288
 +	* g10/tofu.c (tofu_closedbs): Fix freeing database handles up to the
 +	cache limit.  Previously, this would crash if db_cache_count == count.
 +
 +2016-07-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix card removal/reset on multiple contexts.
 +	+ commit 1598a4476466822e7e9c757ac471089d3db4b545
 +	* 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.
 +	+ commit 270f7f7b8b235cc93516566702e2a1d256605cca
 +	* 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.
 +
 +	tests: Add test for ssh support.
 +	+ commit d7a405de8325aa945ab791dcd3bc48272af33b86
 +	* 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.
 +	+ commit 0c1fd4e9884ed7c1edd1819762b9e8a77f606ed3
 +	* 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.
 +	+ commit f474249366e8e143c8e6eb7f7b1a74056e46fa1f
 +	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.
 +
 +2016-07-15  Justus Winter  <justus at g10code.com>
 +
 +	build: Always build gpgtar.
 +	+ commit 7f4dd24b880323a5b772719dafae829c288303a8
 +	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.
 +	+ commit b7b37716b9d2cd1b71b5f7f0e4fb2c1a43eee90a
 +	* 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.
 +	+ commit c49c43d7e4229fd9f1bc55e17fa32fdc334dbef6
 +	* tests/gpgscm/Makefile.am: Add -lintl.
 +
 +	g10: Fix building without trust models.
 +	+ commit d21efa398874be4a15e8283c5fc382fb90f562fd
 +	* g10/pkclist.c (write_trust_status): Fall back to the previous
 +	behavior.
 +
 +	tests: Check for gpgtar.
 +	+ commit 12a887050a560c4cacaf95e4cdb0cc42d8b87aa1
 +	* 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.
 +	+ commit 09c448202ffb4c26d7ec2028351a78e2d3680396
 +
 +
 +	po: Update the German translation.
 +	+ commit 23c2491f94b94fa231bde8187eb958432555eff1
 +
 +
 +2016-07-14  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	dirmngr: fix handling of HTTP redirections.
 +	+ commit 60428c24fb29cb633c9392abb777bc4da88dbfba
 +	* 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.
 +	+ commit 1e9bc66a9a60de668890452d504eea3c3c614f7e
 +	* 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.
 +	+ commit d6d7e4d218a1e2e2a88bc893b00967b032d194f8
 +
 +
 +2016-07-14  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	Update Ukrainian translation.
 +	+ commit 9427288ebb32141c196996315f93535fd7744901
 +
 +
 +2016-07-14  Ineiev  <ineiev at gnu.org>
 +
 +	Update Russian translation.
 +	+ commit 39c88870359bc75e9f72e08a7466fcff01bdc655
 +
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression since 2.1 in --search-key with a fingerprint.
 +	+ commit 0342369ce001b9dba04dc79e7a4eb66fbda278e7
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
 +
 +	gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
 +	+ commit fb14bf0a95e361b0991067e3aea2902d54be811d
 +	* tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
 +	strdup for now.
 +
 +	build: Require latest released libraries.
 +	+ commit c98995efefbdebea8f53d54ba2df4217dfd31ad4
 +	* 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}.
 +	+ commit 66b634f27f10e4c0cb21c3f201998497d0bb24ca
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	gpg: Fix regression due to the new --mimemode options.
 +	+ commit 3b8ed7650d2d63b01ec80ecf9e493b80e3ac7ef8
 +	* 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.
 +	+ commit 82b90eee100cf1c9680517059b2d35e295dd992a
 +	* 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.
 +	+ commit 7b96a8d736934e65bb2adbc17059f84dfeaf95fb
 +	* g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
 +
 +	gpg: New option --mimemode.
 +	+ commit e148c3caa90fbadba32bdbfea9513392e3aea598
 +	* 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.
 +	+ commit 95810929f75bd718dbdf2cd1c0181137a45e2456
 +	* tools/gpg-wks-client.c (send_confirmation_response): Actually
 +	encrypt to the recipient.
 +
 +	wks: New server command --list-domains.
 +	+ commit 44ecc33b4a7147d9c112a72f55a42b65cef4fe67
 +	* 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.
 +	+ commit 7be218177701af316db75057c99ca674d53cf585
 +	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.
 +	+ commit acb27915f8646a875b6bb507ff46cd1bc330c02b
 +	* g13/g13tuple.c (create_tupledesc): Init refcount to 1.
 +
 +	wks: Add --cron command to gpg-wks-server.
 +	+ commit 38eb5f81d223616e3ee34bdfb41c387ce4e7df22
 +	* 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.
 +	+ commit 5de41c4ecef32add89044b8a550a47cce8c6d61e
 +	* 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.
 +	+ commit d3837e0435921bfa5587a50738f5924a5fdf976a
 +	* 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.
 +	+ commit 9b075575cdc5851b019aed5ca5d5e18416beec8e
 +	* 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.
 +	+ commit 0f5b105d96780a29cc58893285e6c38482e0cc2d
 +	* 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.
 +	+ commit 7732b332886792b2bbf47ecf7430e953f1c55a2c
 +	* 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.
 +	+ commit e32c575e0f3704e7563048eea6d26844bdfc494b
 +	* 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".
 +	+ commit cbe467e794f3be81b8da2bcb1732b5514b13b71d
 +	* 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.
 +	+ commit b05878f32aa507aa9087d7c992b630840b5ad71c
 +	* 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.
 +	+ commit 2f61aa0ff11b194d20307751ab686c87cd47dd56
 +	* 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.
 +	+ commit 511c2522b95333226a5e45e538fed29dd44c9be3
 +	* doc/mkdefsinc.c (print_filename): New.
 +	(main): Use it here.
 +
 +	wks: Let the server take the encrytion key from the file.
 +	+ commit e5896da666551da5322b2ae5458d429b9e60241e
 +	* 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.
 +	+ commit a479804c86bc24bfab101f39464db3ecfbaedf6d
 +	* 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.
 +	+ commit 073be51a866cb5600479c504a44ae5ac94a449a2
 +	* 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.
 +	+ commit fdfde91595109e51a5b8fafd292244ad41dfb83d
 +	* 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.
 +	+ commit 7e0c48eb6f18a80142ca2a0f76fe8d270a4e5b33
 +	* g10/getkey.c (pk_from_block): Remove unused arg CTX.  Change all
 +	callers.
 +
 +	gpg: Change calling convention for a function in getkey.c.
 +	+ commit 9385dfeb9dd6d83608a10c7896c341f585a25a2b
 +	* 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.
 +	+ commit 5d1a9c4dc823b418db6c4686da55ee3abdf023b0
 +	* 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'.
 +	+ commit 8270580a5a70874beeffcdd16221937db4bcdc93
 +	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.
 +	+ commit f26fe4f73e8430d93c03d95a8a24fdabd078bb20
 +	* tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
 +	(do_mkdtemp): Handle errors.
 +
 +	tests/migrations: Fix distcheck.
 +	+ commit b70d08827ddb56423ad610b4ebaaaf9cc763512f
 +	* 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.
 +	+ commit 0b8a3358798b7028be872a923da2e275da67d592
 +	* 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.
 +	+ commit a6b87981f7ddef42b25703723162c647e312b125
 +	* 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.
 +	+ commit 8c8ae043b8d65cb79e0e99c5bdbdcbf34714bd0c
 +	* tools/gpg-wks-client.c (aRead): New.
 +	(opts): Add command "--read".
 +	(main): Implement that.
 +
 +	tests: Add a gettime test for sizeof (time_t) > 4.
 +	+ commit 27d158ead4a2b9c52269ef28d050a49c786c7d13
 +	* 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.
 +	+ commit 9177a897732b3cebf3f15c97c1f613f71b6318fe
 +	* g10/import.c (write_keyblock_to_output): Clear ERR on success.
 +
 +	wks: Let the client only export the requested UID.
 +	+ commit 1bfed0bbc5ec9d60d4fb3a0f5c865923ed3563e7
 +	* tools/gpg-wks-client.c (get_key): Export only the requested uid.
 +
 +	tools: Call sendmail directly from the wks tools.
 +	+ commit 7705f310f1406fe49b45e16c371b09863313f24f
 +	* 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.
 +	+ commit c619035d9cd0c9cef62facf5365321289051f9a0
 +	* 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.
 +	+ commit 0e36a1d1fb79c2b75c081616eed00075190b38aa
 +	* 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.
 +	+ commit 442efa9b3ff211c692b6967a944b3d9371ad1bb7
 +	* doc/gpg.texi: Remove some superfluous .E.
 +	(FILTER EXPRESSIONS): New.
 +
 +	yat2m: Fix table formatting.
 +	+ commit aae3cdb61555db4efb26f522030c8303a731d4a9
 +	* 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.
 +	+ commit 7bfc86c938d11c14ea78b196c82ceba2a2f5317d
 +	* 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.
 +	+ commit 5137bf73ccc98a72c2eeac148e4d4b5d58f0a854
 +	* 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.
 +	+ commit f015552374d69e28292a12f2b91ab34d65c9b457
 +	* 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.
 +	+ commit d8bce478be3ae9e401841a77d189ef3c81ccb757
 +	* g10/keygen.c (write_uid): Avoid overflow.
 +
 +	common: Add function to select records etc.
 +	+ commit 681c6ef757a73fc1a63a552186e038db179494aa
 +	* common/recsel.c, common/recsel.h: New.
 +	* common/t-recsel.c: New.
 +
 +	common: Smart up register_mem_cleanup_func.
 +	+ commit 6446a6b3dfd3b2e68b4285870f902ed1f86b0866
 +	* common/init.c (register_mem_cleanup_func): Avoid double registration.
 +
 +2016-07-01  Justus Winter  <justus at g10code.com>
 +
 +	common: Annotate semi-static allocation.
 +	+ commit 49fdd0887c84ed7f7b858b9e7ffa146fcb7f1e87
 +	* common/argparse.c (optfile_parse): Allow string arguments to leak.
 +
 +	g10: Fix memory leak.
 +	+ commit 78aeb236fe4ff3a6d51b3095148e7086f2a6e9a8
 +	* g10/keyserver.c (parse_keyserver_uri): Free URI.
 +
 +	tools/gpgtar: Annotate semi-static allocation.
 +	+ commit cff63da930b6b3f0253668911e0931713b2b584a
 +	* tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
 +	leaked.
 +
 +	g10: Fix memory leak.
 +	+ commit c454922ffa71929c810c6ff048d902498575302f
 +	* g10/import.c (transfer_secret_keys): Release curve from the previous
 +	iteration.
 +
 +	g10: Fix build with disabled kbnode cache.
 +	+ commit ff77b92aae9c8e20cbc7fa7c294adcc6a8c2f614
 +	* g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
 +	cache.
 +
 +	g10: Fix memory leak.
 +	+ commit 44d4c695722d96b3bbef16f2843f62413b9670cd
 +	* g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
 +
 +	g10: Fix memory leak.
 +	+ commit 5fafd18d474da7b763f5b82c73b6ca4288e136d7
 +	* g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
 +
 +	Fix trivial memory leaks in tests.
 +	+ commit 6bfbc368f90b274192d3751274816091675f5109
 +	* 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.
 +	+ commit 8f39185d7bfa0bc749f9ccf4a041d2da4eba24ff
 +	* tools/gpg-connect-agent.c (main): Fix trivial memory leak.
 +
 +	g10: Fix memory leak.
 +	+ commit 401db0eebbcd28dca8f4059706bfbd18d8cc7528
 +	* g10/export.c (do_export_stream): Free secret parameters.
 +
 +	g10: Fix memory leak.
 +	+ commit eb4cdbefb05795b77a8a72189eff246b84442caf
 +	* g10/keygen.c (read_parameter_file): Free 'line'.
 +
 +	g10: Fix memory leak.
 +	+ commit 1de362af9094e0a1a0be60f77fbea7c5190a4dcc
 +	* g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
 +
 +	common: Fix memory leak.
 +	+ commit 6b9a89e4c7d6f19de62e0a908a8d80c98bf99819
 +	* g10/textfilter.c (copy_clearsig_text): Free buffer.
 +
 +	common: Fix memory leak.
 +	+ commit d2d19063d3adf29340aeb39f14e1b1e9aacf41e7
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
 +	context if necessary.
 +
 +	common: Fix memory leak.
 +	+ commit 9037c23979866e6e085b3e32f973bcba590a2635
 +	* common/simple-pwquery.c (agent_open): Free socket path.
 +
 +	g10: Fix keybox-related memory leaks.
 +	+ commit 29beea6462cca32d3278b0f7f9364ff4342327b8
 +	* 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.
 +
 +	g10: Fix memory leak.
 +	+ commit 5869f518cbd8b41b4c9880fc593216b9efeea430
 +	* g10/compress.c (release_context): Free buffers.
 +
 +	g10: Fix memory leak.
 +	+ commit 84f262102be19334534cccc66ed7eceea2714527
 +	* g10/sign.c (write_plaintext_packet): Free packet.
 +
 +	g10: Fix memory leak.
 +	+ commit abae8a9dc8a00cf46291ccb40644b3a7aa477307
 +	* 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.
 +	+ commit 5003caa8fdc80afd5748835c06621014f83e6ec4
 +	* tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
 +	Scheme strings may contain 0s.
 +
 +	gpgscm: Free memory backing string ports.
 +	+ commit 599ad21104e622acbd1230d90d6a23abf9145499
 +	* tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
 +	ports.
 +
 +	gpgscm: Use the allocator from libgcrypt.
 +	+ commit d4ede89981c769b0626ab2b37615da1d12a3b078
 +	* tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
 +
 +	w32: Fix build.
 +	+ commit dbcb342eaf1738798a5378d9ecd83c7946140d54
 +	* g10/keyedit.c (keyedit_quick_revuid): Fix call to
 +	'check_trustdb_stale'.
 +
 +2016-06-30  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: Implement gpg --quick-revuid.
 +	+ commit 55d112eeb0743e90be46d15dbae67368ee7d4b50
 +	* 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.
 +	+ commit 5d6c83deaa11327366b0038928200b9f9f85b426
 +	* 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.
 +	+ commit d8ee0d79a702c92a257884bab86183d32d16ff0e
 +	* acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
 +
 +	tools: Add modules for MIME parsing and creating.
 +	+ commit c334fa8df0e3901857e1a277d3277a873ae4af74
 +	* 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.
 +	+ commit 9c67958c4737b34c60ef2076f57234eec155eb36
 +	* 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.
 +	+ commit 6cb2be91a7cc8a9b8ec42f3956adbb19347318e3
 +	* tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
 +
 +	gpgscm: Fix buffer overflow.
 +	+ commit 56cebdc30c10eaec179a6911e308074264d876ae
 +	* tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
 +	buffer.
 +
 +	g10: Fix memory leaks.
 +	+ commit c57501cc5fa84dbaf560c0fc18853c9540e918af
 +	* 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.
 +	+ commit c14ef10fc347d966a1efcb5c2000cbf3aaafa905
 +	* 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.
 +	+ commit b1e8e0d4b945e077966fb98175191aed056bd957
 +	* dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
 +
 +	gpg: Add hack to --quick-gen-key to create Curve25519 keys.
 +	+ commit 20ca075d9605e27e25a780bcc465c7371400ca61
 +	* g10/keygen.c (quick_generate_keypair): Add special algo string
 +	"test-default".
 +
 +	common: New function rfctimestamp.
 +	+ commit 1ddf5b846fc058171af5f2784dad866b73eb0205
 +	* common/gettime.c (rfctimestamp): New.
 +
 +	common: Add missing header file for clarity.
 +	+ commit 781e614e3b4586da27e54caca39b6a7ed42fc7c7
 +	* common/zb32.c: Include zb32.h.
 +
 +2016-06-28  Justus Winter  <justus at g10code.com>
 +
 +	tools/gpgtar: Fix handling of '-'.
 +	+ commit 4819f687c48c7972c39ae29c7af1e891a4d57360
 +	* tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +
 +	common: Close input stream.
 +	+ commit d36f664bfdc39c05927cb6e14fe1b3ecb7b64bfa
 +	* common/exechelp-posix.c (gnupg_spawn_process): Also close the input
 +	stream in the child.
 +
 +	common: Fix copying data from the spawned child.
 +	+ commit 8f79c31b4d465eeaf81c8046c35bb8c34512dd8d
 +	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.
 +	+ commit 52f65281f9743c42a48bf5a3354c9ab0ecdb681a
 +	* 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.
 +	+ commit b6872353bae778d11730f5d0afd2192750777647
 +	* m4/pkg.m4: New.
 +
 +	yat2m: Silence lint warnings and fix a printf format bug.
 +	+ commit 22b9bea1c3d0e944aa539a87d79e47d92ca5309f
 +	* 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".
 +	+ commit 7bca3be65e510eda40572327b87922834ebe07eb
 +	* 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".
 +	+ commit 1e5959ec059ba41f4de1e2f953300bc040efc16f
 +	* 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.
 +	+ commit 09c6f7135150efbbeb459d4ae0189a81e9d180f8
 +	* 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.
 +	+ commit c229ba4d8b9b16052ee0b9573bed7905be602cdf
 +	* 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.
 +	+ commit e584d6468a2e72cd01e55f46104f9f96b56c0b66
 +	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.
 +
 +	gpgscm: Handle exceptions in the transformation monad.
 +	+ commit 145910afc077e7a5df6cc8b10e180dfa6ce38cc3
 +	* 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.
 +	+ commit 1e822654c1dcfc23a9ef689f4e18c0ebba18baca
 +	* tests/openpgp/multisig.scm: Simplify test.
 +	* tests/openpgp/setup.scm (dearmor): Use pipe.
 +
 +	gpgscm: Add types for special objects.
 +	+ commit 332fa86982dc811640ac8643332d8375816e5b81
 +	* 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.
 +	+ commit e6e56adf208f194ecafda29bb1c1c06655348432
 +	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.
 +	+ commit 3ead21da80da4570e77036cc05303914c9b1f364
 +	* 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.
 +	+ commit d74d23d860c1e5039bd595c31c846782c5cb8025
 +	* 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.
 +	+ commit b841a883a2a66807aa427e65d49067584bedfbe2
 +	* 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.
 +	+ commit 3694579bc4eef27ed53e1845bf03be38c299ce76
 +	* 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.
 +	+ commit 6f5ff1cfe449cf1f4cb7287bc57570eb794216b2
 +	* 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.
 +	+ commit f548383d9af912bf93217068cc8aa99a9a6eda93
 +	* 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.
 +	+ commit c5e0ca5a59ebd91b67944ca125cc8cd73a9d243e
 +	* 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.
 +	+ commit 0340fcdac864109e3dd6edee759efc96e4d3f84e
 +	* 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.
 +	+ commit 65081c31e7536d8fb5effcc2c9aeeffc120c9a69
 +	* 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.
 +	+ commit 5fbbc4b334a73150e709a4802cac99abd8ada61d
 +	* 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.
 +	+ commit d99949fc8cf541018267964629992d55c97ca9ab
 +	* tests/gpgscm/scheme.c (type_to_string): New function.
 +	(Eval_Cycle): Include actual type in error message.
 +
 +	gpgscm: Make memory allocation failures fatal.
 +	+ commit 616582071a2c76c4fb529d4da549aa95ee5d78d6
 +	* 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.
 +	+ commit c19b2061274cd50838e62a2acbdc7e7d24888e7e
 +	* 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.
 +	+ commit 955baf04364721457cd99aad21942523cd50498c
 +	* 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.
 +	+ commit ee2d9061d7abc36b857165a8395203a97380baa2
 +	* 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.
 +	+ commit 971064f8b7ad676326b2a468f688037a303717df
 +	* (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.
 +	+ commit ce1689ea0720552ac900d7b2c4139caf24452018
 +	* 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.
 +	+ commit dfe5282e5859409849a17d68b2b3a046370f65bd
 +	* 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.
 +	+ commit dc1db12d2c4f9f12bc3f7de37f76293b316c3f35
 +	* 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.
 +	+ commit 9609cb20e4caee739b9fc4fd36797029d2970041
 +	* 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.
 +	+ commit d2ce3f9eee34e380536049c0c9d26ed66273f094
 +	* 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.
 +	+ commit 56c36f2932fe2baf8e46efdea4315cf33f3c0338
 +	* 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.
 +	+ commit 8e5ad9aabdd57457f76078924d33acb94b75a877
 +	* 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.
 +	+ commit 3b100da9ada9171d873a796eaf3351d4fceed394
 +	* tests/gpgscm/init.scm (throw): Hand exception value to the handler.
 +	(catch): And bind it to *error*.
 +
 +	tests/gpgscm: Add package macro.
 +	+ commit 2907381f4a7b422823b2304ebe550acbb2f66480
 +	* tests/gpgscm/init.scm: Add package macro from manual.
 +
 +	tests/gpgscm: Expose function to open streams as Scheme ports.
 +	+ commit 55275b8e2b43a3420d85a1a931e02febaa1113e7
 +	* 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.
 +	+ commit 13bba1357478815a85f5c0db3607ebb6cd574f56
 +	* 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.
 +	+ commit e02c1ccae13e4eb55afef8de4f29022c709404eb
 +	* tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
 +	whole error message is displayed.
 +
 +	tests/gpgscm: Handle unhandled enumeration values.
 +	+ commit 133f25703a47e9bbc28c4532934f405ecdeb2de0
 +	* tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
 +	values in the opcode dispatching code.
 +
 +	tests/gpgscm: Verbatim import of latest TinySCHEME.
 +	+ commit cb989504cdd4f0ff902d31af871dc3ee0d9419ac
 +	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.
 +	+ commit 4e41745b3ea3bb8ffc50af6bafeb1de9c928812f
 +	* scd/scdaemon.c (opts): Add --homedir.
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.13.
 +	+ commit b3df4e2ac6aa9b4154e923f71b4221533043e5ac
 +
 +
 +2016-06-16  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +	+ commit d4ce1b04431cf02ebc1bdc7150ad587d599f2a95
 +
 +
 +2016-06-16  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +	+ commit 2273e4f999325cdc9d275507cd07c7e95d62a377
 +
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +	+ commit 69f1b0b041c251abb66f000db173a602693bb18f
 +
 +
 +	Add missing files so that make distcheck works again,
 +	+ commit 4d7d292cd5b616b209dfd4302a1deffe11b7be0e
 +	* 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.
 +	+ commit e44dd878df58dab27c9cd411d80c4c81501e649a
 +	* tools/symcryptrun.c (main): Fix typo.
 +
 +2016-06-15  Niibe Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix another race condition for trustdb access.
 +	+ commit 35a3ce2acf78a95fecbccfd8db0560cca24232df
 +	* 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.
 +	+ commit b56aebe76657ce6efa9c6819d5a8c2a31c2bbbba
 +	* g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
 +
 +	ldap: Improve info output for v3 fallback.
 +	+ commit b7e3dfcf139284d30921cf44e7bab43d4244cc37
 +	* 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.
 +	+ commit f989b6ee0db96c36f13f093cbbcfd1d5b472d03c
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
 +	default Protocol gives error.
 +
 +	dirmngr: Print ldap error if bind fails.
 +	+ commit 5faddcb2927a997e05fb34eb270982096d1fe3a4
 +	* 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.
 +	+ commit 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68
 +	* sm/gpgsm.c (main): Add AES192 cipher.  Allow SERPENT256.
 +
 +	doc: Add files and envvars to a new index.
 +	+ commit 2423238ee4c8a8c531dfe9e45c95f2760b638faa
 +	* doc/gnupg.texi: Define new index "ef".
 +	(Environment Index): New.
 +
 +	gpg: Avoid endless loop in a tofu error case.
 +	+ commit f980cd2e0e4694a38038f518f290017087d4ce33
 +	* g10/tofu.c (get_trust): Do not jump to out.
 +
 +	gpg: Split tofu's get_trust function into several smaller ones.
 +	+ commit 1affdf1efc42ed22dc023c92ca5134d5bcbf2686
 +	* 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.
 +	+ commit 9e126af215143fddbdc3949681abb9ffdb9153bb
 +	* g10/gpg.c (main): Remove deprecation warning.
 +
 +	gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
 +	+ commit 61e7fd68c05ed185728e9da45f7a44a2323065ad
 +	* 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.
 +	+ commit 08c82b1b55d28ffd09b859205b7686bcefae5011
 +	* 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.
 +	+ commit 334e993a71d3abb7d30cb5ee05d578cecf0c3f67
 +	* 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.
 +	+ commit 5ba99d9302cd86aee99958b71075d5288bb430aa
 +	* 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.
 +	+ commit c41c46fa84cabbed74a13ded51fc3a817a919367
 +	* 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.
 +	+ commit a3cb72af79ee645eda212f31ab0b266f2c3d9f29
 +	* 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.
 +	+ commit 7de74320767d15d915942a98ff47c00175a078ed
 +	* 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.
 +	+ commit 00f30cc01c79bbdff5cdc3be795f009f15d3845e
 +	* 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.
 +	+ commit 8127043d549a5843ea1ba2dc6da4906fc2258d53
 +	* 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.
 +	+ commit 6790115fd9059e066b4e6feb6b1e3876a1c1d522
 +	* 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.
 +	+ commit cf4910419e09daf414f76ca2c8ab685c3d488ec1
 +	* 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.
 +	+ commit aab8a0b05292b0d06e3001a0b289224cb7156dbd
 +	* 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.
 +	+ commit def512eb67c8a380f3b873cee0f156deef0b6dda
 +	* tools/gpgconf.c (opts): Add --homedir.
 +	(main): Set homedir.
 +
 +	Do not use no-libgcrypt dummy for tools.
 +	+ commit 173fa97102fec68670a46ae1b460231e2a183c81
 +	* 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.
 +	+ commit 0faf8951544f43790c412777a926c969540174bd
 +	* 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.
 +	+ commit 36550dde998fa1d497098050ca2d4e1a952ed6b6
 +	* 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}.
 +	+ commit fb88f37c40dc156fa0b5bfba4ac85f1e553fd7e9
 +	* 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.
 +	+ commit 22a7ef01aa2c0eb77bcc40174d09104acc35cab1
 +	* 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.
 +	+ commit 650abbab716750d6087a457a25fa2efaaa3567cd
 +
 +
 +	gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
 +	+ commit abeeb84a94be815a16e678b319cb5c8bffde2811
 +	* 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.
 +	+ commit 7257ea2d450238afa4d162fab8001f74782fe43f
 +	* g10/gpg.c (main): Init keyid_format to KF_NONE.
 +	* g10/keyid.c (format_keyid): Ditto.
 +	(keystrlen): Ditto.
 +
 +	gpg: Add option --with-subkey-fingerprint.
 +	+ commit 1d1cb86694fb2223de1da0b3bfffb5c62f505847
 +	* 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.
 +	+ commit b047388d57443f584f1c1d6333aac5218b685042
 +	* 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.
 +	+ commit 79b7a8a9e0d41b743ceaee20dc47294359fe0d44
 +	* 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.
 +	+ commit 8d976a6b07c5a356631791b46b590328c1451f31
 +	* 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.
 +	+ commit 1b460f049e5c1c102d8b55ad28781688252c5a6b
 +	* 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.
 +	+ commit 01285f909e43e8d6a48fbcc77bb5af53d567d8a2
 +	* 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.
 +	+ commit dcc4cd83821667be22e502af86139bb4bd41bdf7
 +	* 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.
 +	+ commit 8f2a053a0ffa0430d01a53b4d491a3f0fff683eb
 +	* 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.
 +	+ commit d837f6b0eadb14ea08c1c6030b4d6adaaee8778e
 +	* 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.
 +	+ commit 072acb69be55e366e2da921e3953404765fa3928
 +	* 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.
 +	+ commit db1ecc8212defdd183abbb6b1407fcc8d2dc9552
 +	* 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.
 +	+ commit 67a4bc8d536f6997f14daff4c039abd48a172100
 +	* 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.
 +	+ commit 239a4d53916b47b5b0f0167a9b2c7a8915bb9c52
 +	* 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.
 +	+ commit 44a32455c8e41400ea96db4507c8a42bdb65b3b6
 +	* 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.
 +	+ commit e6d9a2d07ed7aeac3944d8a7d1317c4a117356b4
 +	* common/exechelp-posix.c (get_max_fds): Use /proc/self.
 +
 +	common: Speedup closing fds before an exec.
 +	+ commit 512c56af43027149e8beacf259746b8d7bf9b1a2
 +	* common/exechelp-posix.c [__linux__]: Include dirent.h.
 +	(get_max_fds) [__linux__]: Return the actual used highest fd.
 +
 +	tools: Improve debug output of rfc822parse.
 +	+ commit ad75ca9c963bebbe02aae8d73e199a705764ae82
 +	* tools/rfc822parse.c (show_event): Add missing events.
 +
 +	build: Remove obsolete tests for funopen and fopencookie.
 +	+ commit d755bcb89dbeaf6c7c1eca73ccabdf89b536c535
 +	* configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
 +
 +	common: Extend gnupg_create_inbound_pipe et al.
 +	+ commit 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
 +	* 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.
 +	+ commit 96c7901ec1c79be732570811223d3ea54875abfe
 +	* 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.
 +	+ commit 6c957c3d880c069bb843cc58fdcebb9fc344727e
 +	* 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.
 +	+ commit b3e043ba905fdf2efcdadbd7022ac53f4408b748
 +	* 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.
 +	+ commit 74028096e06d2904f77b74b373750264e5b7b1ea
 +
 +
 +2016-05-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpgtar: Simplify code by using ccparray.
 +	+ commit 91bc7833836f19256d56984c94cacf44853ff5c8
 +	* 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.
 +	+ commit 2421f7f7ed74ed20372efd63a2efd58d3b55005c
 +	* 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.
 +	+ commit b9d1e099c3ec3163c86afe627ecbe028db1facf6
 +	* tests/openpgp/export.test: Test pinentry interactions.
 +
 +	tests: Add support for a passphrase queue to fake pinentry.
 +	+ commit 4994153924e0948a657edddaef54a39a6001beff
 +	* tests/openpgp/fake-pinentry.c (get_passphrase): New function.
 +	(main): Add option --passphrasefile and read passphrases from it.
 +
 +	tests: Add logging to fake pinentry.
 +	+ commit 41b10c66ec1dd33633386f4fc8013ddeab7737ca
 +	* 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.
 +	+ commit a54e89a58576108fcae10ceeb4fc65822aecc170
 +	* 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.
 +	+ commit 78bb08425af5b1edb7f3ef0119013529b3a9e4ba
 +	* 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.
 +	+ commit b1ba460d8f3358342c2ee2927114d36e767a439f
 +	* 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.
 +	+ commit 006a6126131ffd59d9a47889ac031f932ecc5d0b
 +	* g10/tofu.c (tofu_closedbs): Close combined DB.
 +
 +	gpg: Store the Tofu meta handle for databases in CTRL.
 +	+ commit 754b1c463034a634a678d8efc76c27fd46aad9b9
 +	* 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.
 +	+ commit 027c4e55522b8e18711a3331932a9869ab89ca26
 +
 +
 +	gpg: Fix the TOFU_STATS_LONG status.
 +	+ commit fd973ee1c18aa8fe764e09ba4dff589309b2d78d
 +	* 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.
 +	+ commit 437c97ab6a34ff1936001dd05209193b4466a81d
 +	* 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.
 +	+ commit cf97769906337d65289ad58225a5ecc53c715550
 +	* 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.
 +	+ commit ff71521d9698c7c5df94831a1398e948213af433
 +	* 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.
 +	+ commit 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb
 +	* 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.
 +	+ commit ac9ff644b12c4dfa55d466af8ae6af54d1646893
 +	* 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.
 +	+ commit 693838f0125d5d0c963fa3771b1bd117702af697
 +	* g10/keyedit.c (sig_comparison): Actually compare the pubkey
 +	algorithms.
 +
 +	gpg: Request a "save" after cmd "check" fixed something.
 +	+ commit d33b35f7481caa0dcb25f9fa7d6c5bb27895297a
 +	* g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
 +
 +2016-05-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +	+ commit ff870d59f067d3c5415e231c02a50d5dceac7e48
 +
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.12.
 +	+ commit 00df5b1236cac5c7a48638a4613278c5aab486f8
 +
 +
 +	speedo,w32: Remove the installation directory page.
 +	+ commit fb1e9df48465c2f77a65dddd257572fdc79d9450
 +	* build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
 +
 +	gpg: Fix const char pointer mismatch with gettext.
 +	+ commit 920b1421b35d1404b8360bd8feac0be659840543
 +	* g10/tofu.c (get_trust): Use const char *.
 +
 +	speedo: Build sqlite with static-libgcc.
 +	+ commit edce430b039b313cc2d79402a7bd21347490c3be
 +	* build-aux/speedo/patches/sqlite.patch: New.
 +	* Makefile.am (EXTRA_DIST): Add file.
 +
 +	speedo: Also try patch files w/o version number.
 +	+ commit 9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd
 +	* build-aux/speedo.mk (SPKG_template): Try such a patch file.
 +
 +2016-05-04  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	speedo,w32: Install sqlite.
 +	+ commit 2b78223d7587c68e2e27a3d7b365219228da7947
 +	* build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
 +
 +	speedo,w32: Fix uninstallation.
 +	+ commit 5ec76fd0c300b52366cf8d1407fe1c8de3a8a9d4
 +	* build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
 +	dirmngr-conf.skel
 +
 +	speedo,w32: Install localisation.
 +	+ commit 3f58fc64666101e160e9b13fedb6cdaebeb91a7a
 +	* 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.
 +	+ commit d696eb396a9c88319358da4333feb653994d5408
 +	* 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.
 +	+ commit 4fd13ab78dd228d8ff85659cddc2076af8728ebe
 +
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +	+ commit 75f31cdd42eed3555952ac478055d52af841f702
 +
 +
 +	Some minor string changes and fixed a printf format.
 +	+ commit d00625dae60f26617d2e1bd4f22c6b35a4e92c91
 +	* 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.
 +	+ commit 04cc7c3786d91881f83a72799dab058476602a31
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	agent: Make --allow-loopback-pinentry the default.
 +	+ commit 3ef0938cfd8637e9801369f142eb8dd564f2ca61
 +	* 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.
 +	+ commit 9e28617e260261de3972c20698b5a01561330e1c
 +	* common/argparse.c (strusage): Print https URLS.
 +
 +	tests: Silence output of some tests.
 +	+ commit 33aacc3d4bbd6a82d7e7ceca058970879741b7da
 +	* 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.
 +	+ commit 83865be35cff5355a5c4575cc3b50609819b0baa
 +	* 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.
 +	+ commit ae1889320b822d48f7118a29391605e9ac992701
 +	* 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.
 +	+ commit 5cef6118580fe658a27d32e85696d88775ad417a
 +	* g10/tofu.c (time_ago_str): Mark non-breakable spaces.
 +	(show_statistics): Remove marks.
 +
 +	gpg: Re-format some tofu messages.
 +	+ commit d73e83c3b678add11a5754e199e528aeb39ec8ce
 +	* 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.
 +	+ commit 6677d8b61446eb5760a30a2488c992d6e895a9ed
 +	* 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.
 +	+ commit 35f4b6aafdf1889ed1ae569af5852f47738fe993
 +	* common/logging.c (do_logv): Add indentation when called via
 +	log_string.
 +
 +	gpg: Factor some code code out of tofu.c.
 +	+ commit dcad99c98616a6031ddfde313c920339e4012378
 +	* 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/.
 +	+ commit 64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c
 +
 +
 +	common: Improve log_assert.
 +	+ commit 9740dff9f4d18ba764dc7173d4902e94e3f0c2e8
 +	* 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.
 +	+ commit cb4fee8bb645745ff199f7428e19226d5bc63dab
 +	* 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.
 +	+ commit 508b0deb70d39d388149be9a63fab24cc956a239
 +	* 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.
 +	+ commit 87de9e19edf0311ca0342e15ef44ebe40e32861e
 +	* 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.
 +	+ commit c83c6f212e9bc98a9ea8dd8102bc16edd1a03050
 +	* dirmngr/server.c (cmd_wkd_get): New.
 +	(register_commands): Add command WKD_GET.
 +
 +	dirmngr: Use system provided root CAs with KS_FETCH.
 +	+ commit c3aeda82b8d00b87a5af72b4075c487c10dfdf6b
 +	* 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.
 +	+ commit fd765df6a7883c3d841abeb657330a1aab4b7756
 +	* 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.
 +	+ commit b7fa4960c292ef1a290d32b7f46bb741bbfc0923
 +	* 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.
 +	+ commit 8776abbe02935e720018f3ef6ffd48f21435ff8b
 +	* 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.
 +	+ commit 12af2630cf4d1a39179179925fac8f2cce7504ff
 +	* 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.
 +	+ commit c6d1f2f08c68efe7e80887219064a8ce6365128f
 +	* 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.
 +	+ commit 95303ee11df12f284e98d02dba993eda9e425383
 +	* 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.
 +	+ commit 342cc488890241b41e49f50886617115342721d6
 +	* agent/keyformat.txt: Convert to org mode.
 +
 +	tests: Make migration test more robust and silent.
 +	+ commit 0c35e09278514f1e3377a4b0a9b1f44dd39b1bf4
 +	* tests/migrations/from-classic.test: Fix in-tree build, silence test.
 +
 +2016-04-21  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Use --enable-gpg2-is-gpg by default.
 +	+ commit d81de224ecd542922dda649a492dd9550509d7bc
 +	* autogen.rc: Add option also for plain Windows.
 +
 +	w32: Replace libiconv DLL by iconv feature of libgpg-error.
 +	+ commit bd4d65615b3a5360d455b99e77bd113ad90f1539
 +	* 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.
 +	+ commit f8adf1a3234655877a4f985d627d98567507002c
 +	* 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.
 +
 +	tests: Test the migration from a classic GnuPG home directory.
 +	+ commit defbc70b4a16264e067daf76678ecfb9d030dee4
 +	* 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.
 +	+ commit 2385b9f1ddc4938e45c01a12a804f4b77d253305
 +	* 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.
 +	+ commit d02de6c0a4a55a2720cfa5caddcbfc4ce988a2ec
 +	* 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.
 +	+ commit 085b19fc9aa7f2f9b82a97824b117e71390964ec
 +	* 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.
 +	+ commit 6272f24312f2efe8707a7712858c85cd5a42e6fa
 +	* dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
 +	when supported and no uri provided.
 +
 +	dirmngr: Fix https incorrectly reported in help.
 +	+ commit a0642856b25622c81d3464979c47ff2a30af58fa
 +	* 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.
 +	+ commit 8c3fb2360f154a971d2a390e4937acb22a44a8c2
 +	* agent/protect.c (do_encryption): Fix CBC hashing.
 +
 +	agent: Allow gpg-protect-tool to handle openpgp-native protection.
 +	+ commit 6df75ec70afeb1a5ad9a00557e1245e1514c37b5
 +	* 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.
 +	+ commit 94504b3d5af126abb591dedda1ca0f0970822f55
 +	* 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.
 +	+ commit 4159567f7ed7a1139fdc3a6c92988e1648ad84ab
 +	* 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.
 +	+ commit 7faf131c8b8710419df3dc13a1228d1977c55f53
 +	* 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.
 +	+ commit 02cf1357dd5ee34a57371f55b9d312b8b9e3a7e8
 +	* 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."
 +	+ commit 76ca869197e304daa5a8dd96ea43113ec7b28354
 +	This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
 +
 +2016-04-05  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Autodetect PEM format in dirmngr-client.
 +	+ commit 9354293b8c9f234939bc04182f15e2fe512e914e
 +	* 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.
 +
 +2016-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	build: Fix for: Build gpgcompose only in maintainer mode.
 +	+ commit f45ed07a0fffa3adbc75b9d5726108a066927599
 +	* g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
 +
 +	doc: Install gpg and gpgv man pages under the correct name.
 +	+ commit 4dc4fb1c14b3096bb1cdc5923c0d1eb419036805
 +	* 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.
 +	+ commit 4b5341dc333983a15f649601fdddc42ba9161433
 +	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
 +	mode.
 +
 +	gpg: Replace use of "gpg2" by GPG_NAME.
 +	+ commit 7b58a1118d98543ed6854447d7b403877638ba54
 +
 +
 +2016-04-04  Werner Koch  <wk at gnupg.org>
 +
 +	Now build "gpg" binary but install as "gpg2"
 +	+ commit 96bcd4220f1f1313afe12097d8dc62342ac8de0d
 +	* 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.
 +	+ commit c6ed863491ec3a1e0fcf9cbe2c93c87468306c29
 +	* 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.
 +	+ commit abb352de51bc964c06007fce43ed6f6caea87c15
 +	* 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.
 +
 +	tests: Fix default key test.
 +	+ commit dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c
 +	* 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.
 +	+ commit 6060ea898fda499211c9d5030fff41d58f899fb0
 +	* configure.ac: Disable TOFU if configured without trust models, and
 +	check for conflicting options.
 +
 +	g10: Remove option --always-trust if compiled without trust models.
 +	+ commit b74185b6eaeaae4754726ff203e11977777f568c
 +	* 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.
 +	+ commit e7171f559590422cc52dbcb8d78d94569b31012f
 +	* 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.
 +	+ commit 8be9dab2dd2f83ca922c01542c63b404e34bdfd9
 +	* 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.
 +	+ commit e2c5781788f765815532410a77077ddbb72513e9
 +	* 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.
 +	+ commit fc30c079a348436868968850dabf653b91f82419
 +	* g10/keygen.c (ask_key_flags): Improve message.
 +
 +	gpg: Remove the extra prompt for Curve25519.
 +	+ commit 7f919063d3e426104fe58ae779a9a066140014c1
 +	* 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.
 +	+ commit af9a4afbf0b518c8acff98e50135b2beb6c722c3
 +	* 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.
 +	+ commit 1aad5c6277ea3852ff57bbf680f61c9136ce4d5c
 +	* 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.
 +	+ commit 1dc7f55a4095ee42ce2d8c3eb41b7162edf2ca2e
 +	* doc/gpg.texi (--enable-large-rsa): Improve text.
 +
 +2016-03-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: allow removal of the shadowed key.
 +	+ commit 8588c2dbc4c4d1b53796f3dbe8489b932dca7a60
 +	* agent/findkey.c (agent_delete_key): Remove the key when asked.
 +
 +2016-03-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Add const qualifier.
 +	+ commit b752d2c93778e6a1c1de3eddf8fc725b0ddd354e
 +	* 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.
 +	+ commit 60b34f96f4f390670462d719c0d797e622cee4d4
 +	* 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.
 +	+ commit 834b84c0ee4990393daa5e44afbab5b0aaed0758
 +	* 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.
 +	+ commit 4f578cb2fc192f44070bb0d18dffaa3863ed0d92
 +	* 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.
 +	+ commit b17577eac6b7599a4bab6fd3ecb04715aa01367c
 +	* 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.
 +	+ commit eea139c56ef55081d8cd8df2a35ce507386e0f17
 +	* 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.
 +
 +	sm: Remove unused argument '--fixed-passphrase'.
 +	+ commit 53ed98eda77ff2dcf390cebd0cec9f2665661863
 +	* 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.
 +	+ commit a68ca5a90457ac97eee4efd7fdea596d27c54697
 +	* 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.
 +	+ commit 7a32f87cccddb40521bfdd4eb2d0dc9c88fb3fe5
 +	* 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.
 +	+ commit e997552161b2dd8aabf350adee14e208e1545aef
 +	* 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.
 +	+ commit 1e4b7823008daea1a22a6f0f9b379fdec37a4cd4
 +	* g10/main.h (disable_core_dumps): Drop declaration.
 +
 +	g10: Guard code against errors.
 +	+ commit 40f6529ceeea806fc011135a9fa3a3590a9534ac
 +	* g10/keygen.c (do_generate_keypair): Check for errors, in which case
 +	'pri_psk' is NULL.
 +
 +2016-03-03  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Add more missing CFLAGS.
 +	+ commit 9f0ba5089e664447c36cee3d9249f95e4ea39957
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GCRYPT_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
 +	tests/openpgp: Skip gpgtar test if it has not been built.
 +	+ commit a883d4c0f8125e809c144ec69e76c9f522102d8f
 +	* tests/openpgp/gpgtar.test: Check if executable exists.
 +
 +2016-03-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Add new program gpgcompose.
 +	+ commit d040628ddf2c09ddc9581ff365680a568ad24278
 +	* 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.
 +	+ commit 605276ef8cd449bfd574ae6c498fa5d7d265c5c7
 +	* g10/armor.c (is_armored): More robustly detect valid non-armored
 +	OpenPGP messages.
 +
 +	common: Provide a function for mapping packet types to strings.
 +	+ commit 24e0f1d56e6f56e7fb52b5c6bdb100131e12dfe3
 +	* common/openpgpdefs.h (pkttype_str): New function.
 +
 +	gpg: Rename pop_filter to iobuf_pop_filter and export it.
 +	+ commit 1463f9b9624fae97cc89df3aa4546655ee893f7c
 +	* 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.
 +	+ commit 7eac4942b537c4b3710d34e6adb9c5d36338f38b
 +	* 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.
 +	+ commit 2fdb950471bd36f046672254ff26ca94797cc9f1
 +	* 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.
 +	+ commit 1a624586149f9e34206e5d5e1ba0b7d2b7004c80
 +	* g10/build-packet.c (blob_to_notation): New function.
 +
 +	gpg: Refactor the printing of binary notations.
 +	+ commit fd2d00ccf558b1ac1184967d8702ef01cd60bf60
 +	* 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.
 +	+ commit 1cdb744d91ab33563fc0b3156fb05694caa55278
 +	* 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'.
 +
 +2016-03-02  Justus Winter  <justus at g10code.com>
 +
 +	common: Consolidate Assuan server argument handling.
 +	+ commit e77c85577d1bdd77ad3b81907145fd68f2653c01
 +	* 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.
 +	+ commit 9a1778abcae0a7afe33be8e02b6d9a909463cd54
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GPG_ERROR_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
 +	tools: Drop superfluous include.
 +	+ commit 3a1d142f9b71721a631cf2037665e9def60aa384
 +	* 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.
 +	+ commit 2de0d41219a522e01f050d475b3ddecb9173fc7d
 +	* 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.
 +	+ commit 87515e39295e4b7eaec1641c38e1ac32e8d39a91
 +	* 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.
 +	+ commit 960f5e26f2cda3ac6e6b30548fa808a690c39ffc
 +	* 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.
 +	+ commit 105a5629c7e938ec7b3c9c338ebe7bdfee4cfdad
 +	* g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
 +	packet's format.
 +	(write_header2): Likewise.
 +
 +	gpg: Add some asserts.
 +	+ commit c9636a1acc952eb8e1355089bc2e229dece98165
 +	* 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.
 +	+ commit 512bc72e1f8544341529174142273d857f45540c
 +	* 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.
 +	+ commit 75861b663bbb37214143c2ff7b1b4d1d10ba2657
 +	* common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
 +
 +	common: Improve a function's documentation and comments.
 +	+ commit 14d27b2cadf9b0bb413f2b8bad2d81c1d370c2e7
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
 +	documentation and comment.  Add an assert.
 +
 +	common: Add log_assert.
 +	+ commit f57a91afb69c58f9d8d9632801650f28c7dc1e0d
 +	* common/logging.h (log_assert): New macro.
 +
 +	gpg: Use higher-level functions.
 +	+ commit 33ac735a781325c4d47cdf6216813866ab93562e
 +	* 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.
 +	+ commit 8066f8a3470f9d2f3682a28641a7b09eca29a105
 +	* common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
 +	start copying.
 +
 +	common: More accurately name function.
 +	+ commit 903466e124841cb29f518afa6b7706d490737ac3
 +	* 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.
 +	+ commit f7968db30b0e0ccae038e354568accb0a05d877c
 +	* 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.
 +	+ commit f26867928c451443769fecc41c3283e077e8c49f
 +	* 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.
 +	+ commit ede0061febe5b2edde6a1a79d599e3c7c0faed5a
 +	* tests/openpgp/Makefile.am (required_pgms): Qualify executables with
 +	'$EXEEXT'.
 +
 +	tests/openpgp: Reimplement 'pinentry.sh' in c.
 +	+ commit 01dcc2cf2f2f00235ffa7d0718ecb468370980cc
 +	* 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.
 +	+ commit 785a7f463ec4e937304ce1263c5e6a46e8079137
 +	* 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.
 +	+ commit 629284120ff359b98a178b6cddf0e005e5f4db1a
 +	* tests/openpgp/version.test: Fix file removal.
 +
 +	common/exechelp: Provide a way to wait for multiple processes.
 +	+ commit 5ba4f6047b84e4cfdb3e6bc88e574ca7a455da81
 +	* 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.
 +	+ commit 9f4a8d4ea173b4b4cb4d4f06b4004d43e2f4b97a
 +	* 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.
 +	+ commit 54acc87c1e0b100accbfd02cfce59a897f2f0ce1
 +	* 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.
 +	+ commit 709e2a7e9a3197e8ded4be0b05c138e8d5adbca6
 +	* common/exechelp-w32.c (do_create_pipe): Use symbolic names.
 +
 +	common/exechelp: Disable debugging by default.
 +	+ commit 5d8f7b16c8490d6951772fa98c1f075a952cc571
 +	* common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
 +
 +	common/exechelp: Fix handle leak.
 +	+ commit dd670366d7aedb07e9420d1f8575197acfae1914
 +	* common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
 +	handle.
 +
 +	common/exechelp: Fix opening the 'nul' device.
 +	+ commit 8857590006266da200427f2d4f9e8c27fbc89ed9
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
 +	device.
 +
 +	common/exechelp: Fix error handling.
 +	+ commit f5a4b6a3a39a2b78d33769184d6133d5e256e02c
 +	* common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
 +
 +	common/exechelp: Fix pipe creation.
 +	+ commit b0125ae9850973b89010517b1dbce04125a51d51
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
 +	input pipe.
 +
 +	tools/mk-tdata: Fix data generation on Windows.
 +	+ commit 661ba477e01b796db161fa612b46c353393c6b10
 +	* 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.
 +	+ commit 2d1d795481bc011447284f8ce0a3ae96a08daf17
 +	* 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.
 +	+ commit 44cdb9d73f1a0b7d2c8483a119b9c4d6caabc1ec
 +	* 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.
 +	+ commit 5fbd80579aea0f75ca1d2700515c5b8747a75c7d
 +	* 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.
 +	+ commit ac5aea95455372145f3f06df2b4c1584d759d660
 +	* 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.
 +	+ commit 10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea
 +	* 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.
 +	+ commit bf9d1248c80205795e26156f67aff0b3f796cfce
 +	* 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.
 +	+ commit c45633a571bf663bc7f3610fc481acded6acfc19
 +	* 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.
 +	+ commit 7e7f35a2d7d40267a4dd30791df77420efeebfa7
 +	* tools/gpgparsemail.c: Add and check info->signing_protocol_2.
 +
 +	gpg: Clean up dangling agent_open and agent_closed declarations.
 +	+ commit 813df2fe6656e55bea4d0be07cc964a140218412
 +	* 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.
 +	+ commit e1ceff16765b0342531709cf97d03ef0158c29d5
 +	* 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.
 +	+ commit 44b02e1beb4f38f26551d932827d5317fddd27c2
 +	* 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.
 +	+ commit 2f02ed75a9671a7aae36968d5a1618f71b491325
 +	* 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.
 +	+ commit a1c11283af759c1045a8bb75815db325f415ded4
 +	* 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.
 +	+ commit ea9cfcfbf76de232221f31787c53d5f46361a9f0
 +	* common/iobuf.c (iobuf_ioctl): Fix.
 +	* g10/encrypt.c (encrypt_filter): Likewise.
 +	* g10/keyring.c (prepare_search): Likewise.
 +
 +	dirmngr: fix for memory alignment.
 +	+ commit 6fbe12a51e8fe2649ffe5a8a02aa93026a8f02cd
 +	* 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".
 +	+ commit 9b28b82e7c40d1eacc446d5932cd613c56378ed8
 +	* 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.
 +	+ commit 9663b088480cef6734a3c5892d5ddbbd60ecc1a4
 +	* 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.
 +	+ commit 5cdde08ea869ef02111f618ad782d392a296eb7f
 +	* 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.
 +	+ commit c0268c449d0f3d23be5ec7b92fe92e7e078166cf
 +	* 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.
 +	+ commit ad43dc6cfc2b610a4e34fe55811bd937f9c3238b
 +	* 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.
 +	+ commit 86f3bb144ad75461eb9b7ac1e59046ac75efccac
 +	* 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.
 +	+ commit b0e6ab1109d05fc664f46e17d721fe9b01d38115
 +	* 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.
 +	+ commit 13f745b50dc7031755faadb2d3476a6b6aafc739
 +	* 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.
 +	+ commit 59fc3507d18072833559f227ecab8aa00cad9466
 +	* 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.
 +	+ commit 82d12156ef5f948d44934ed44d79d24cc9e94366
 +	* 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.
 +	+ commit 4f152f3276b6d40d2568a27e74903dd18b41d752
 +	* 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.
 +	+ commit dc1dbc43a6bfb2f3e6a1cc2ca089e0318b3af0ed
 +	* 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.
 +	+ commit 3087197008d2b12bf9f0d7d1f2aca500db816e7c
 +	* g13/sh-cmd.c (cmd_device): Set ERR.
 +
 +	g13: Fix releasing of a syshelp context.
 +	+ commit 6390beca54f55e8d36ff767b99ae9ff68b15f10e
 +	* g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
 +
 +	g13: Switch over to common/exectool.c.
 +	+ commit c5d7045dafcfb569c11c90c04ea7a75328c80084
 +	* 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.
 +	+ commit d19d6e1856c9a1acbf48e8b2e39b3d9171aa9f7f
 +	* 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.
 +	+ commit 81494fd30d3815502247a721f50d9eadf86a73fa
 +	* 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.
 +	+ commit d711f5c7697cd4bc5dc6d9fd01706cabc771dad2
 +	* 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.
 +	+ commit acac103ba5772ae738ce5409d17feab80596cde6
 +	* 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.
 +	+ commit d9f9b3be036747c9f55060aed47896f951bfb853
 +	* 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.
 +	+ commit 75311cfe18071b94c66121a9785b133b6df345a3
 +	* 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.
 +	+ commit 3d952a2fe5da9d84c20d3debdcc1e425b08781c6
 +	* scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
 +	int.
 +
 +	scd: Fix detection of libusb.
 +	+ commit 1b90b52a56b4f808ad29a7ef79aeafc03c7424b4
 +	* configure.ac (HAVE_LIBUSB): Clear if no header file was found.
 +	(LIBUSB_LIBS): Ditto.
 +
 +	dirmngr: Build fix for FreeBSD (EAI macros)
 +	+ commit 4d67144142f04184b835e50314eb21b882b9e00a
 +	* 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.
 +	+ commit d0d97089706286fafd3c8ff56f3b5bf7ac07c6e0
 +	* 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.
 +	+ commit e9e5e83ec14459c2fc9060c54fc8e7381b541acd
 +
 +
 +2016-01-26  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
 +	+ commit 3e50236d4ecc3601b2641bf4273a0ff64bb5fdc4
 +	* 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.
 +	+ commit b8bb16c6c08d3c2947f1ff67419b36eb203c5c1a
 +	* g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
 +
 +	sm: small fix for GCC 6.
 +	+ commit d33a34004bef028068538f099c32a0e292a004c3
 +	* 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.
 +	+ commit fbe1cf67aadc5a33cf815ddbcfc9669e43caa123
 +	* 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.
 +	+ commit ee87c653bf4b495714e8e6b024d0a8ace3a33452
 +	* 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.
 +	+ commit 039a55716b8abd22ce23a96dce34cf2dc4be1862
 +	* 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.
 +	+ commit 12c665b36cdc4b7189549698fc4cc1b3523b18f5
 +	* 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.
 +	+ commit 77bceb2902dd489443073d91836ea54376c60bf6
 +	* 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.
 +	+ commit afb8696126ff0babaab23e884ff5da008281e3b7
 +	* 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.
 +	+ commit fc0c71dfe5ea8f1c683101948c23f5d2064ee4cd
 +	* 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.
 +	+ commit bb99b40bd1e624f58ca806ca16dc73d4d594a30a
 +	* 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.
 +	+ commit 09117e769a093467cb47154f36d7dda613313e33
 +	* 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.
 +	+ commit bdb61351776c038d668310d9b5e5c32588ef6519
 +	* g10/trustdb.c (tdb_get_validity_core): Print message only in debug
 +	mode.
 +
 +	agent: New option --pinentry-timeout.
 +	+ commit 499743387f4d07847a2842358bc54f9237e0c2a7
 +	* 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.
 +	+ commit cfa41890bb5ff306c07dad295136601fe47566a7
 +	* 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.
 +	+ commit 8b7f64f9dfc80b2a0ad235996b47369c2ba9b48f
 +	* common/util.h (GPG_ERR_DB_CORRUPTED): New.
 +
 +	gpg: Add function print_further_info.
 +	+ commit d96e76d15f61812b950b64a60bc47117785a9dac
 +	* g10/misc.c (print_further_info): New.
 +
 +2016-01-18  Werner Koch  <wk at gnupg.org>
 +
 +	g10: Improve strings printed by tofu.c.
 +	+ commit 79778a8dd5f61a6b7abeeb44b75d82932db788b7
 +	* 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.
 +	+ commit 9309bda9581715d304305c8c5116f2cbb31aec77
 +	* g10/sig-check.c (check_signature_metadata_validity): Use days if
 +	useful.
 +
 +	Use ngettext for some strings.
 +	+ commit 437965e5622612941ed0fa55584811c65069242e
 +	* 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.
 +	+ commit 3cccd5a83b96e4558642dcdf5d974f64ebdb9817
 +	* 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.
 +	+ commit 663c5d129a8f400cc6eb8ab7b91772d6e578152d
 +	* 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.
 +	+ commit 3b1248e007a6bf830a3230ee2d9cc548205ec31a
 +	* g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
 +
 +	kbx: New function keybox_file_rename to replace rename.
 +	+ commit 8241ed59d05e06252647b26477ed5c2f84895a26
 +	* 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.
 +	+ commit f5cceef115f0307664956d01c48b1b397fdad4b3
 +	* 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.
 +	+ commit 360534bde770f4845669de223154216d249b954b
 +	* 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.
 +	+ commit c7ca0f73dbe7c080b79f93f90f00ba2396fc4bd0
 +	* 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.
 +	+ commit 9b6c91469a804c60289a2ed21334dfd856c294bb
 +	* g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
 +
 +	kbx: Improve and fix keybox_lock.
 +	+ commit 8f1368d5e3f7654ad9cb100053535f728dff2344
 +	* 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.
 +	+ commit 4aceebf36f103eb380e21d12a1f08b7d6ea7cc8e
 +	* 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.
 +	+ commit 160862978628b07ed5150ec2c8abad6af1656bc3
 +	* 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.
 +	+ commit 9dc355ad3ae0026ab04c424dc984d748b8fad393
 +	* 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.
 +	+ commit 96237b9a63a50aed1884cb06f84279b977d6a8fa
 +	* 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.
 +	+ commit e2f984b4afffaa89bdeba2f5d447b5681237177e
 +	* 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.
 +	+ commit 4b4639b0b04dc82c550fa711dd7193e13fc4a428
 +	* common/iobuf.h: Fix comment.
 +
 +	common: Fix iobuf API of filter function for alignment.
 +	+ commit 3f52c7da3940ec06572270d511000dc7fe9c27d2
 +	* 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.
 +	+ commit b280aa6423c9492e8c5a9afa57339d06d957996d
 +	* g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
 +
 +2016-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Remove gpgkey2ssh.
 +	+ commit eb9c021631174fde4c1c444bbc533a7a46d570cd
 +	* 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.
 +	+ commit b2da3951a395366bf1644bc4c4eb42d657effe17
 +	* g10/export.c (key_to_sshblob): Add hack for ECDSA.
 +
 +	gpg: New command --export-ssh-key.
 +	+ commit 4970868d8d84d3a64b067e5aafc9f097621758d3
 +	* 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.
 +	+ commit 34bca9cd4b8517795833cb754b0d5b1dd33b08ed
 +	* 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.
 +	+ commit 2aa42baaf3dd7c3ae613ae0c61760a17c8adfcd0
 +	* 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.
 +	+ commit 4d7ac43ff71fdadfd2e04621f74840a82fbe788a
 +	* 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.
 +	+ commit 496643291e1e346434e9c98405c5a370957eb7d3
 +	* 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.
 +	+ commit 833ba5faa1340aff80a205acbb701d4ae1d594d0
 +	* 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.
 +	+ commit 8fd406c317ad7c2e375ae4f7d20656dadf6d7fcc
 +	* g10/keyid.c (keygrip_from_pk): Return an error code.
 +
 +	gpg: Avoid warnings about possible NULL deref.
 +	+ commit 8a56a38387c10c02ba0790c655dd5c1d08e4a724
 +	* 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.
 +	+ commit 008aa6e6d4b213c3a0d15509eb46cf168b6f2c94
 +	* 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.
 +	+ commit 126aebbb82667d160c8c4435898efeb3b43c4ec8
 +	* 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.
 +	+ commit 0de7d61437bd0bfbe645d5eed7a62df03129fb32
 +	* 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.
 +	+ commit a41638acf4808caa619f4f3f4c0dcd12be00d6f8
 +	* 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.
 +	+ commit 2c3e67430d9b523c85c81ae562223fd51e3608cc
 +	* 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.
 +	+ commit c7389ae90fa4a70766400cc241ff6a45aa750324
 +	* g10/test.c (TEST): Print diagnostics only in verbose mode.
 +
 +	gpg: Avoid using an uninitialized SALT on premature EOF.
 +	+ commit 85cc7449fb00ac85b0c2eecd22bd38b23f33edf5
 +	* g10/parse-packet.c (parse_key): Check for premature end of salt.
 +
 +	gpg: Silence warnings found by static analyzer.
 +	+ commit 09accc0e3d74e6289bed40b5bfc6479981cabfe4
 +	* 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.
 +	+ commit db82b6131d437bf6ba34db0e08b7dfa9edb11e45
 +	* 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.
 +	+ commit 6deafb92abe100ff67e3a0a230a39e8c0ad41900
 +	* dirmngr/t-dns-stuff.c (main): Do not print info during standard
 +	"make check".
 +
 +	common: Avoid warnings about useless assignments.
 +	+ commit e64317c15e9960f3173d374e589f7c3565a4ad08
 +	* 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.
 +	+ commit 1fbfa1bf0a6ad0dc7ed67d12252643c2c6c7370a
 +	* tests/openpgp/4gb-packet.test: Use error and info.
 +
 +	common: Do not deref vars in tests after a fail().
 +	+ commit 0a00115ee2049ab2357b7a14a51c7da185ffcabd
 +	* 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.
 +	+ commit e70f7a54f29d727def2cfe9ea5ab9d461b4ce842
 +	* 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.
 +	+ commit ff3b607fc879b70665c187500022cc63e2a0cd86
 +	* 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.
 +	+ commit 575c15a090913d86cf8d75b2bc4471e371f234b9
 +	* g10/getkey.c (get_pubkeys): Fix double free.
 +
 +2015-12-24  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: IMPORT_KEY with --force option fix.
 +	+ commit 79b51bb8727bd3485229ac8ff5987558156d5d83
 +	* 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.
 +	+ commit 5ca57f1a697e875bae5a5c73f1a580c42ca75343
 +	* 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.
 +	+ commit 44aee35e69540510617aea4b886ef845590960fe
 +	* g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
 +
 +	g10: Allow relative path for specifying the file for bkuptocard.
 +	+ commit ee433d2b00c93b5a4e4ed54b9fb5806361df1b71
 +	* g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
 +	Also support tilda expansion.
 +
 +	g10: fix regression of bkuptocard subcommand in --edit-key.
 +	+ commit 40959add1ba0efc1f4aa87fa075fa42423eff73c
 +	* 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.
 +	+ commit e684c634df814b12d399dcdc375c35d3e9a137af
 +	* 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.
 +	+ commit a9cbdcfd9c364557787f4a173cc59f14c067946e
 +	* 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.
 +	+ commit 363ed2e892adc97fae97111bb56b64f9f809e8d5
 +	* g10/keygen.c (card_write_key_to_backup_file): Simplify by using
 +	hexfingerprint.
 +
 +	gpg: Add standard free() semantic to pubkey_free.
 +	+ commit 04c9cddda95f2a8ca5c0cf10bb3dd6accf56cf45
 +	* g10/getkey.c (pubkey_free): Check for NULL arg.
 +
 +	gpg: Fix use of assert from commit dc417bf0.
 +	+ commit ef7b7e91600f35b4d682a6267001a8d30f0fa49f
 +	* g10/keydb.c (keydb_update_keyblock): De-ref after the assert.  Use
 +	%zu for size_t.
 +
 +	gpg: Do not translate debug output.
 +	+ commit b0c9867fb74d5a00335e6606d5bdcc5342ce26cd
 +	* 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).
 +	+ commit aecf1a3c57ca8bf8050a3743b62fe142ccf9eb22
 +	* g10/keygen.c (do_generate_keypair): Clear the variable S.
 +
 +2015-12-22  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix type.
 +	+ commit 5c759924fb92b6de7ab3baed7871e5114ebd2505
 +	* g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
 +
 +	gpg: Fix error message.
 +	+ commit 4654384fe7a4dcee113dacf27c398b13dea5d0be
 +	* g10/getkey.c (parse_def_secret_key): Fix error message.
 +
 +	gpg: Don't check for ambiguous keys.
 +	+ commit 7195b94345b0bb937477dc47fc5ec27fb108a099
 +	* 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.
 +	+ commit dc52995d85048ed12ae8b9f330e9ca41a4030aae
 +	* 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.
 +	+ commit ffe0b7a6dd6bfaec62f81f511b3caf08978bb269
 +	* 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.
 +	+ commit 4103850c2e51274984f69443dee34295cbb8c282
 +	* 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.
 +	+ commit dc417bf0c555a7416d0aedde6645fd1087660f92
 +	* 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.
 +	+ commit 02eb9fc9d5863abcfed6af704e618f8cac7cc2e8
 +	* configure.ac: Only add the user supplied CFLAGS after running any
 +	autoconf tests.
 +
 +	gpg: Suppress a warning.
 +	+ commit 1cceba163b17b5e9fd7c89e5b40e3d7e1cffc885
 +	* dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
 +	avoid a warning when ADNS is not available.
 +
 +	gpg: Remove dead code.
 +	+ commit 4143cc1c3783c54a6f733f08a4739e4e5fb0c8b3
 +	* 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.
 +	+ commit 7fe4be0416cdc9269011bc4213b8a22d6ced295c
 +	* 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)
 +	+ commit 478ca6c75bbf529f95974224dfb7d71bd5860a96
 +	* 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.
 +	+ commit ee8a8ec1cf4605e5af427f9c8b01b3609c82cbe7
 +	* 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.
 +	+ commit d8392299f311f8cfcf8bc02679dd3ae7ef8cc6d7
 +
 +
 +	g10: clean up of headers for card.
 +	+ commit ab9a9bce77d014159c68460f5a7c263fb72f3c1c
 +	* 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.
 +	+ commit 98f9e14323bf806f674b3cc259e19ef6219b4378
 +	* 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.
 +	+ commit af142854a73567836a0ca44ad62900469c23d531
 +	* configure.ac (PKG_PROG_PKG_CONFIG): New.
 +
 +2015-12-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Remove deprecated internal functions.
 +	+ commit 72eaff1aa610f3c89a755f212760157e1932d847
 +	* 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.
 +	+ commit b30c15bf7c5336c4abb1f9dcd974cd77ba6c61a7
 +	* 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.
 +	+ commit e644aa7f5943174e3f7ba9408af71531fd125a0b
 +	* 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.
 +	+ commit fc010b6c7fe14e609734e448775fa384421bdef1
 +	* 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.
 +	+ commit 4ffe44c5874ed655d82adfa7a85439fab91cde03
 +	* 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.
 +	+ commit 345ec7323d643528d2f904765708b5ecfe51f57b
 +	* 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.
 +	+ commit 2ea1aebc924c3f0b2269f83cb1b80c75d9fa069c
 +	* g10/misc.c (print_reported_error): New.
 +
 +2015-12-15  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve the keyblock cache's transparency.
 +	+ commit f369efd6712148dc7ed40dba6d1ff5b0e169431a
 +	* 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.
 +	+ commit 2e4e10c1dcd8dfeafec51f44ebf26acfeb770c41
 +	* 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.
 +	+ commit 0ea186db645da2b51a7e71f46793d447f2de5e3d
 +	* 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.
 +	+ commit 4ee881bff4c8fdfa4b3b7a4b7afab611471e97f1
 +	* 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,
 +	+ commit 7baca033070e7811f75e2021100adf8e6a48907f
 +	* common/isascii.c: Change.
 +
 +	common: Change license of some modules to LGPLv3+/GPLv2+.
 +	+ commit 7d129a7391115ff1d6a3541078a37a630ab7819f
 +	* 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+.
 +	+ commit 467e18b74b4790dcbdf3c816206d2fbaf170a12a
 +	* common/exectool.c, common/exectool.h: Change license.
 +
 +	common: Rename sh-exectool to exectool.
 +	+ commit d80e1bc430bf64debdb6b08f0b7e5c42836781fa
 +	* 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.
 +	+ commit f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc
 +	* 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.
 +	+ commit e573e6188dada4d70f6897aa2fda3c3af8c50441
 +	* 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.
 +	+ commit d40975cbe8ff86fcc4a1b4963fdffc66ddee85ce
 +	* 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.
 +	+ commit 4d3395ef1fcde0b8c454c09956863959d590ede6
 +	* 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.
 +	+ commit f0ae40b0c901e5f5c04c6ed5b2ab96ab7340b2bd
 +	* 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.
 +	+ commit 1605e34fc365edd473aac15c9b4e5aadc1d95cf5
 +	* g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
 +
 +2015-12-11  Justus Winter  <justus at g10code.com>
 +
 +	agent: Improve error handling.
 +	+ commit 25f0f053cd306200a6211b5cf397838a59835ee7
 +	* agent/pksign.c (agent_pksign_do): Improve error handling.
 +
 +	Fix required libgpg-error version.
 +	+ commit d6e01493cad6ff32f356185c7a2d2b5c2b86a937
 +	* 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.
 +	+ commit 6dc37c5fb60acbfd5ba2ab979852383eac8944e0
 +	* 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.
 +	+ commit d1a97585c5e73fbc7d4cf90e38f76ffc5aea305f
 +	* 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.
 +	+ commit 1c8eae95a8b3b89bc0f49cb5f4938101634583dc
 +	* tests/openpgp/gpgtar.test: Add more tests.
 +
 +	dirmngr: Initialize http status code.
 +	+ commit 71726b627dcff015dc12568021b31d8ccede788a
 +	* 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.
 +	+ commit b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9
 +	* 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.
 +	+ commit 6d64ef869dfbcb7aaa802b80ed648393147e40d8
 +	* 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.
 +	+ commit 6ac57a482f7ae02db1bee4e4b861288fc6905adc
 +	* dirmngr/ks-action.c (ks_action_search): Search all configured
 +	keyservers for the given patterns.
 +
 +	dirmngr: Handle http status '501 Not Implemented'.
 +	+ commit a8308ba5231682ce7c7d591a17e7e940fbd63189
 +	* dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
 +	GPG_ERR_NOT_IMPLEMENTED.
 +
 +	tools/gpgtar: Implement symmetric encryption.
 +	+ commit 582e684a48eb4f3716cecf7dc73eb93046efcfad
 +	* 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.
 +	+ commit 45c814f348c89acd8d21d0607ffcf68e5c5c399e
 +	* 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.
 +	+ commit 0c0dafd8e89bb702e856c661c1561e10cdcaf37f
 +	* 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'.
 +	+ commit a81aca6e1c2a4529d416d1989f15d7338d2ee81e
 +	* 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.
 +	+ commit d955cb5e0700c6d2b6b26cb210b5a176d22d4235
 +	* 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.
 +	+ commit 2ae07f826aa551db8adf714158fce962790a6b54
 +	* common/sh-exectool.c: New file.
 +
 +	Release 2.1.10.
 +	+ commit 9fadfdb3109f7ea42aaaa9d745b64c6c90cb8233
 +
 +
 +2015-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Japanese translation.
 +	+ commit 762fcc027b0b4cc88c1f633804de619273d6a8b9
 +
 +
 +2015-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Improve installer.
 +	+ commit 0fe3614d9afe42ecf80bbc932366ceeaba0a0ecc
 +	* 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.
 +	+ commit 28311d1fa56bfbd801103a8475597459132874f4
 +	* 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.
 +	+ commit 4ff2cae7dee36ffee854c5f05c3e8ee9eb0308dd
 +	* dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
 +
 +	gpg: Allow "help" as value for --tofu-policy.
 +	+ commit 59f6192cb766612ad215bc6a3af13d5b137139e4
 +	* g10/gpg.c (parse_tofu_policy): Add keyword "help".
 +	(parse_tofu_db_format): Ditto.
 +
 +	Do not translate messages printed with log_debug.
 +	+ commit 218a52787a87be6b7481a39f87d212d6ef594e97
 +	* 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.
 +	+ commit f03976f1101f539a2782cd9e87d640fc32a022db
 +	* scd/app-openopg.c (do_decipher): Fix the condition.
 +
 +	scd: Simplify saving application context.
 +	+ commit 9639af5f16a7ed908cbce2415330b9fcd88edc90
 +	* 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.
 +	+ commit f747adfa21551e083bc947540c64c94a96dcc059
 +	* 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.
 +	+ commit e28f2e7a2f265af8bbdb4979e9679b4396dccdd5
 +	* 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".
 +	+ commit 0f61599ed0bd1cc6842067d040bb58ec0a451715
 +	* doc/Makefile.am (gnupg.texi): Depend on defs.inc.
 +
 +	build: Change how caller provided CFLAGS are used by configure.
 +	+ commit 4e9957250eee3521dc979912a4818e58ffddc5b8
 +	* configure.ac: Append instead of prepend caller provided CFLAGS.
 +
 +	gpg: Add variant of 'key "%s" not found: %s' error message.
 +	+ commit 5e2c5e9ec5b75fae886e1294adbdb7ad2ac12827
 +	* 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.
 +	+ commit 50a568e7380752454c029eac2b57d8803b1cb287
 +	* g10/keyserver.c (keyidlist): Clear *KLIST on error.
 +
 +	gpg: Take care of keydb_new returning NULL.
 +	+ commit a28ac99efead8be73ea1704abe1611ccc4811c54
 +	* 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.
 +	+ commit 9fcc047d921bde95b6807325b7fd2b697e89907f
 +	* 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.
 +	+ commit f42c50dbf00c2e6298ca6830cbe6d36805fa54a3
 +	* 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.
 +	+ commit 11b2691eddc42e91651e4f95dd2731255a3e9211
 +	* 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.
 +	+ commit cedbd4709eed6fead9d1b271f96860c00547c77c
 +	* 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.
 +	+ commit 69db3285e4612ad24462149a4d64cc32c090a491
 +	* 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.
 +	+ commit 28195f8d27aa0fc9daf5b74fb24de87c36e04739
 +	* g10/tofu.c (initdb): Improve documentation.
 +
 +	gpg: Fix type mismatch resulting in a buffer overflow.
 +	+ commit c73d75103cbd34975e2bd28e9924caee05eaf829
 +	* 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.
 +	+ commit 28e2513721ff0cec920564d4087f3600cce8672e
 +	* 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.
 +	+ commit 17ac843871d5f350f26edff0187f94ced923f534
 +	* 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 '!'.
 +	+ commit 10cca02c4c70eee993d4df0a1d20ae841992efe9
 +	* 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.
 +	+ commit 9c34711539fc2c34aea8da0fd49ae6aa28991518
 +	* 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.
 +	+ commit 3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d
 +	* configure.ac (show_tor_support): New
 +
 +2015-11-30  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Make make distcheck work again.
 +	+ commit 4ecb5db804003c10c57bdc0dc7f1d9649c5ba6f8
 +	* doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
 +
 +	yat2m: Add keyword @url.
 +	+ commit b4756a54a55fcd51717c149e19191a2eeaa6a919
 +	* doc/yat2m.c (proc_texi_cmd): Add keyword @url.
 +
 +	doc: Build man pages with the same date as the info files.
 +	+ commit 081c902f16a2f251df4593f090b3978dfa473a26
 +	* doc/Makefile.am (yat2m-stamp): Use option --date.
 +
 +	yat2m: New option --date.
 +	+ commit 75eb071354d1f862bac09c56c8ab81dae8883270
 +	* 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.
 +	+ commit 686f31c3d5aee0d2825265869ae92ca95cdcabae
 +	* g10/keyedit.c (menu_expire): Use only one prompt.
 +
 +	kbx: Include gpg-error prior to mischelp.h.
 +	+ commit 436a154ea85e4dffbde7c3b316fbfca1b066aa2a
 +	* kbx/keybox-init.c: Change order of includes.
 +
 +	gpg,w32: Fix a format string error.
 +	+ commit 7c856f99144b84ac30e0c9a192f09dc36d93190a
 +	* g10/keyring.c (keyring_search): Fix format string for off_t.
 +
 +	Silence compiler warnings related to not using assuan_fd_t.
 +	+ commit 501436ab0f9d8e7d56b2f5e344006be5f5a3c653
 +	* 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.
 +	+ commit 64e87083394d38998feab359caac917bcc6139d3
 +	* 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.
 +	+ commit 100f34e869df899a695f5e5ef1b8e092baf91751
 +	* tools/gpgtar.c (parse_arguments): Use a block for a local varibale
 +	definition.
 +
 +	dirmngr: Avoid casting away a const from an char**.
 +	+ commit 6501741d2c1beb8060198a39a1aa950cb11b386f
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
 +	global variables.
 +
 +	dirmngr: Allow testing for a running Tor via "getinfo tor".
 +	+ commit da5a232199ef93be219e933a7eaf4ccfc6d24d61
 +	* 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.
 +	+ commit 82f6abb4807c89388052ab442368d9e09fb84aea
 +	* g13/g13.c (main): Use existsing function.
 +
 +	common: Fix off-by-one access in the new format_text.
 +	+ commit 61941a984964308b09c7fc1b3438fb99d0b3c917
 +	* common/stringhelp.c (format_text): Use existsing fucntion to trim
 +	trailing spaces.  Fix off-by-one access.
 +
 +	dirmngr: Improve output of "getinfo tor".
 +	+ commit d226e67856e7197c581dcd2cef0f1e687bee0ac9
 +	* dirmngr/server.c (cmd_getinfo): Print a message along with OK.
 +
 +	dirmngr: Let Libassuan employ nPth wrappers for connect.
 +	+ commit f95cff1cc9e7a4d9f6b7c45188ec47e70f9874dc
 +	* 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'.
 +	+ commit 676b2d7081291f7e47a66755ab07af259fea130b
 +	* 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'.
 +	+ commit 69a8440f44fa025e33a4cc32d17695c9ac385043
 +	* 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.
 +	+ commit 1a045b1324efabe7423a8d00245f01718ed72556
 +	* 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.
 +	+ commit 2eb3248058330dd5c37560d9887db5b5266c54fe
 +	* 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.
 +	+ commit 35c0c8b211bc891335e822379b33ea34fbc1f84f
 +	* 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.
 +	+ commit 556e8c44267fe3b829ca06286e9b5637ca1a6a73
 +	* tests/openpgp/Makefile.am (TESTS): Add new file.
 +	* tests/openpgp/gpgtar.test: New file.
 +
 +	tools/gpgtar: Handle '--directory' argument.
 +	+ commit 127aba9a4d6c1aabb4a18a74b16d3bddc6eb5c54
 +	* 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.
 +	+ commit 89e104eb38c3a6896892ff09db11cb1bae2bb0d3
 +	* 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.
 +	+ commit f76fb047c15914ba44dc9423d235484758bcd721
 +	* 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.
 +	+ commit 40dbee86f3043aff8a8c2055521e270318e33068
 +	* 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.
 +	+ commit 03bf88f32c8d203d5b3bfbbc48cc45e6c08cc187
 +	* 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.
 +	+ commit cb18d802308bde4e28219417bb4d107a4c0001b4
 +	* 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.
 +	+ commit ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae
 +	* 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.
 +	+ commit e9c16fee2576c772de9d4fb5d53fee28e4b84202
 +	* 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.
 +	+ commit 19362a8dd7ee986c082a5afc5a446f939991ec0f
 +	* 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.
 +	+ commit 5b84b0d660c8329e184d98682665aaea7e1703d2
 +	* 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.
 +	+ commit b75e1b3d8b1643640d046f7f8e89adf5b1caa7a3
 +	* dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
 +
 +	dirmngr: Fix SRV record lookups when using the system resolver.
 +	+ commit 946faaff04f3340ed6db9e89c5036dc5f9beca6a
 +	* dirmngr/dns-stuff.c (getsrv): Fix error handling.
 +
 +	dirmngr: Honor ports specified in SRV records.
 +	+ commit 73c1a86ad937d7be027eece991c69aaeb6a1f092
 +	* 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.
 +	+ commit c9f5aa15793b3c05c1b92af401b23ab34d3e6196
 +	* dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
 +
 +	dirmngr: Refactor 'map_host'.
 +	+ commit 3f52f6bcacfe3877d30a21464e93e9240bc75085
 +	* dirmngr/ks-engine-hkp.c (add_host): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Fix pool detection.
 +	+ commit 23ea641ba2a063cc99c82869061703d48bc674b2
 +	* dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
 +
 +	dirmngr: Refactor 'map_host'.
 +	+ commit 2b43a0515868b8720009e48d7a1f32d571767f14
 +	* dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Start dirmngr on demand.
 +	+ commit a9e0b1dd6c106e243e3fbbaa1838b56a1f1c8584
 +	* 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.
 +	+ commit 770c06ed4e6c1097d6e305a0a9427c3c783b787c
 +	* 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.
 +	+ commit b64b33bb80a8cf5dcc1fdbc62023d019fe2c8cb1
 +	* 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.
 +	+ commit 19f099463c82c119288a05eaefc42bf09d617377
 +	* 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.
 +	+ commit 178af9c3f56d385fe28a9e5e8bde0ab34c0b260e
 +	* g10/revoke.c (gen_revoke): Error out if the search description is
 +	ambiguous.
 +
 +	gpg: Refactor print_seckey_info.
 +	+ commit f8a65ac96b27a0963892892ce6e93b37b8df1ad7
 +	* g10/keylist.c (print_seckey_info): Break formatting functionality
 +	into...
 +	(format_seckey_info): ... this new function.
 +
 +	gpg: Improve an error message.
 +	+ commit 46e128d44a0456dc603bc9e25a4c5d8da903b078
 +	* 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.
 +	+ commit 6b14df5525777ee0330a34a7b335359f562616a4
 +	* dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
 +
 +	dirmngr: Fix memory leak.
 +	+ commit b223cde311e4e02f7983e33fe3d7214287dfb678
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
 +	arguments.
 +
 +	agent: Improve error handling.
 +	+ commit a1650b1edf80c2526c0576547b3a574e8d30f1fa
 +	* agent/trustlist.c (istrusted_internal): Initialize 'err'.
 +
 +	common: Avoid undefined behavior.
 +	+ commit eb957ffc4797fb019c505510295af244baf5be38
 +	* common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
 +	will make use of it.
 +
 +	g10: Avoid undefined behavior.
 +	+ commit 52f7f195b119dc01bdf3ae200fdc8e04a0bb9bcb
 +	* g10/trust.c (clean_one_uid): Avoid a computation involving an
 +	uninitialized value.
 +
 +	scd: Improve error handling.
 +	+ commit 6a37b45a7f13cf5d2ae7d6c9cd796a4bd197b80d
 +	* 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.
 +	+ commit eb54fca4bf3ef8e0cd50b01df5b40e0d6d318d7e
 +	* 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.
 +	+ commit 84ebf15b06e435453b2f58775f97a3a1c61a7e55
 +	* 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.
 +	+ commit 0b86c7463c8c057496b38e06c00f0ae4288dad49
 +	* 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.
 +	+ commit 1e3dbb15affd6d75a477aa17715d8e5470988c08
 +	* 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.
 +	+ commit 58e4a492e2c8e908d16135486ed601f602f1e38d
 +	* 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.
 +	+ commit 848726f5c02faddb0b0fd24ce1a66893f5325675
 +	* 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.
 +	+ commit ad9befab12376b3a49cde410996ac9f0013d0871
 +	* 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.
 +	+ commit 11ec4785df1646643966d872b1b53ef675092c98
 +	* 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.
 +	+ commit a052c30d31c0f6b532fea081f4a9bee083f5440f
 +	* 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.
 +	+ commit eae982ed6d69644258afe9c4ad1be553853d8403
 +	* 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.
 +	+ commit a9e0905342e847e8961ec4fe9b3aaedf05e33423
 +	* 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.
 +	+ commit 8e2bea22b0927f4f95a248cc7517f407a705d8a8
 +	* 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.
 +	+ commit 3689c2105aab6a4304e9464c5b20207d69b9a133
 +	* 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.
 +	+ commit e7d7160ab7cd4e6b460bfe36fd3a7275adadb4e2
 +	* 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.
 +	+ commit 7de8376430625c1f6f3a58ae16276deca8ff6a82
 +	* g10/tofu.c (get_trust): For the UTK check lookup the key by
 +	fingerprint.
 +
 +	gpg: Fix regression in --locate-keys (in 2.1.9).
 +	+ commit 7e59fb21f728b5f54468cd35b1415a2f86003d4f
 +	* 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.
 +	+ commit 2038adf16d0e7eeb614043aae17b16a867de6b70
 +	* 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.
 +	+ commit e3c48335f9c5081c6080bceafa7a04140403427a
 +	* 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.
 +	+ commit a3b26d6c0839ec18d1dc226bb537d5067c86d574
 +	* 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.
 +	+ commit a2cc1d57552ccac7b2f9a0c6423b171b2a168b2a
 +	* 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.
 +	+ commit 7546e818791988c00b8635dab5b899265d8d9f42
 +	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.
 +	+ commit 67c701d1e53f56305e3b8771c683c45bb9672305
 +	* 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.
 +	+ commit 951f277b6bf8178560105538d38e2a07a96865bd
 +	* 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.
 +	+ commit 288c9919dc45496b2380eeac487a8539692d6842
 +	* 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.
 +	+ commit f92e95175e90120362a7d6376fb32307e11267b5
 +	* configure.ac (HAVE_ADNS_FREE): New ac_define.
 +
 +2015-11-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add reder information to --card-status.
 +	+ commit bce0e3f71df0709a7d323a688ddf2690c1727a6c
 +	* 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.
 +	+ commit 2242658efe0c975a46c3316bc9171ddbce085e2c
 +	* g10/decrypt-data.c (decrypt_data): Use already translated strings.
 +
 +	common: Fix commit f99830b.
 +	+ commit 20125333e7b822e8c70ac8cef986649f0654eb56
 +	* 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.
 +	+ commit 28e198201e580b39bceb9c151df07fc0e936a91d
 +	* g10/decrypt-data.c (decrypt_data): Fix formatting string.
 +
 +	gpg: Add new option --only-sign-text-ids.
 +	+ commit a74aeb5dae1f673fcd98b39a6a0496f3c622709a
 +	* 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.
 +	+ commit f99830b72812395da5451152bdd2f2d90a7cb7fb
 +	* 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.
 +	+ commit e8c53fca954d33366e3494a6d4eecc3868282bcc
 +	* 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.
 +	+ commit f38bac8883ea2e9ed8e2836f97a953efb85e774c
 +	* 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.
 +	+ commit 23e163473f050d1f2c08f589beb9dab283b7d624
 +	* 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.
 +	+ commit a958ffd148a46f3757d1c309bb13555638044640
 +	* g10/keygen.c (ask_user_id): Indicate which characters are invalid.
 +
 +	gpg: Add support for unwrapping the outer level of encryption.
 +	+ commit ec409e62aea6cc829299be794f9d035d033cb51b
 +	* 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.
 +	+ commit fd4b9e232805b2e30b29903568c95cc0aad8bbec
 +	* common/iobuf.c (iobuf_copy): New function.
 +
 +	doc: Note that gpgkey2ssh is deprecated.
 +	+ commit 2b0e0a53b4db8c44e299f57a9f4f9fc1b825e707
 +	* doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
 +
 +	tools: Fix gpgkey2ssh's most gratuitous errors.  Use gpg2, not gpg.
 +	+ commit cd2d685230ecafb7df504ef2b16cf1ec9a014300
 +	* 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.
 +	+ commit 2b27acc3435e73fad7460b551a36b4064cdd58be
 +	* 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.
 +	+ commit 6897bbf1aa9bf0a61b186ea1a9bcb463fb1fd10e
 +	* g10/gpg.c (main): Print a better error message for --multifile
 +	--sign --encrypt.
 +
 +	gpg: Add --encrypt-to-default-key.
 +	+ commit de9b2340153d70b083494d1a277a384dcf43bff0
 +	* 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.
 +	+ commit e16d7168c54e5f7bc2f0037806ee4f730930eaf0
 +	* 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.
 +	+ commit 1e94a672efb8bf66f416bc63bf6670e509a21fe5
 +	* scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
 +
 +	scd: fix change_keyattr.
 +	+ commit c5a9fedba66361ddd9f596528882750068543298
 +	* 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.
 +	+ commit 44ad9f29d43f40bbc1840454880f4af3df1c5295
 +	* 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.
 +	+ commit 62b8cd5495dcac9a0f8a3d88c7bd4cd80997fd3f
 +	* 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.
 +	+ commit 621afac37e5555fd68054531e611ead444b62928
 +	* 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.
 +	+ commit 36326112290b6eef47c9dada30dddbdf408680e4
 +	* g10/tofu.c (show_statistics): Break the time delta to string code
 +	into...
 +	(time_ago_str): ... this new function.
 +
 +	gpg: Fix message formatting.
 +	+ commit c8ef9f9a64d13ea8b9b4ade62525243abe2976ba
 +	* g10/tofu.c (get_trust): Fix message formatting.
 +
 +	gpg: Don't store formatting fingerprints in the TOFU DB.
 +	+ commit 8ae3946d28c43e30ef692ba6cf1a7fa4ed65ecc5
 +	* 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.
 +	+ commit 06f3eadb22986d9ebde9efff2794eb1d45d6c6d4
 +	* 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.
 +	+ commit 18cd09246f5dcddcafb8662afd84fa046e36de3f
 +	* 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.
 +	+ commit d89a9fca46d9bba497dde0793b57217c800b0e8d
 +	* 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.
 +	+ commit 5aadb4b62d26e1bfb40a1ce444a81c2a5a56159c
 +	* 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.
 +	+ commit 641df615da4937b0073c420a0503c5810c237972
 +	* 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.
 +	+ commit d68bdc553a206e54234d5d53ad35c4ba34133118
 +	* g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
 +	failure.
 +
 +	gpg: Remove unused prototype.
 +	+ commit ef052591ba51ee16bafc3c5b79d837ed8f01b520
 +	g10/keyring.h (keyring_locate_writable): Remove unused prototype.
 +
 +	gpg: Eliminate a memory leak.
 +	+ commit 89eee5f6b7ca3da7ebdcc3e5d069701d0834b39e
 +	* g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
 +
 +	gpg: Fix keyring support.
 +	+ commit 99c84b49b787dab8da26cf61eed24dd4a2b77fd9
 +	* 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.
 +	+ commit 421827424fe87855307fe3e803b42ffa02738600
 +	* 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.
 +	+ commit 351f4213e192aa11500c0c590d11183edbe326c5
 +	* 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.
 +	+ commit d25e29ad9374da1c11ccfc38f392dbab2d707042
 +	* 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.
 +	+ commit 8b6c83dcb086ef09b2676e4d5b0111c88b7b8bf8
 +	* 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.
 +	+ commit e095a3fcf2ccc6cc4e258111dc395558069a1164
 +	* 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.
 +	+ commit fa15a71daff8414bf4112bc2826dc495ff2fb01f
 +	* dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
 +	failure.
 +
 +	dirmngr: Minor cleanup of the SRV RR code.
 +	+ commit 949a5cfdabcafab93c1ac092c0459b59318805b9
 +	* 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.
 +	+ commit e026efb4363bc6e3c41ed533daf06f103ebd2e32
 +	* 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.
 +	+ commit a6c2c098435a703ca02abf651ff4fa45e5a4db9a
 +	* 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.
 +	+ commit 91015d021b3dcbe21ad0e580a4f34c523abf9e72
 +	* 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.
 +	+ commit 0d37a40fc34519e93af3ceffff2cd726d29576d3
 +	* g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
 +	functions.
 +
 +	dirmngr: Support Tor hidden services.
 +	+ commit 4524a2a3714f263d56bb7db349c169b456994fd9
 +	* 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.
 +	+ commit 7735bbe539af35ce16e270946d5ae798c5989d6e
 +	* 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.
 +	+ commit c18fb0d99b633bb267dead6e7c46229f4b780bc3
 +	* 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.
 +	+ commit 5b0ed7674dc718ee98e0c80aa93ce014f2b51411
 +	* 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.
 +	+ commit 5e7ac031f513ad3b60e4f092fa72b3bec0676515
 +	* 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.
 +	+ commit 0e3c9f184a5fb3e41277700d690febc2eee9600a
 +	* dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
 +
 +	dirmngr: Replace use of getnameinfo by resolve_dns_addr.
 +	+ commit 927f34603d942868af6a7bd0f347681bbad76a94
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
 +	(map_host): Use resolve_dns_addr.
 +
 +	dirmngr: Implement a getnameinfo wrapper.
 +	+ commit 816505958ac4308ee0dfe787d1b706982428b6cc
 +	* 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.
 +	+ commit 7f65e84ac035e8f7a25639a6b09eb6000115e337
 +	* 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.
 +	+ commit 297cf8660ce346638e42934d84d746768f8bb10a
 +	* 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.
 +	+ commit cd879d4bd69a578be5a1ff96497f8c1181885563
 +	* g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
 +	Update users.
 +
 +	gpg: Use the proper type.
 +	+ commit 3c4c89cc35280164b509977c5288b0a06d6f530e
 +	* 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.
 +	+ commit 8b06d7f41aec6cb993445935dba7c60e033d026a
 +	* 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.
 +	+ commit e03a4a94bb67d4a6c958b37671f83456e203f325
 +	* 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/.
 +	+ commit 41bb01ae792af78edd28bf1b735cacc0b3ac428a
 +	* 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.
 +	+ commit 1e34007c972c1d7730cfcacd88f6bbebba7dec1d
 +	* 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.
 +	+ commit b6af3377e14fad35b9c6041b11888cabce6e8a56
 +	* 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.
 +	+ commit 6fafda979df8e7e117f8e6929bcce89513a6e746
 +	* 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.
 +	+ commit afbe87fa2d259b665b2d67a038a8535cfcfee094
 +	* 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.
 +	+ commit 8bccbf477878fd99baa96e11db9db99aaf1e8d91
 +	* 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.
 +	+ commit ffe60eb3d2b8f7d6c506804ce4645d695c91f237
 +	* 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.
 +	+ commit 9afeb4cca10c3632495fe71b23df99a4878bd3a5
 +	* 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.
 +	+ commit 8c3b7915d675ca5346c17244654d5c6ab583ac44
 +	* g10/trustdb.c (validate_keys): Don't free UTK_LIST.
 +
 +	gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
 +	+ commit cbaca254ac818c49c18d4480d3c7bd246cc57ae8
 +	* 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.
 +	+ commit df57390d68482c5b3fa5ff3a42a29ae1b6cbb23c
 +	* 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.
 +	+ commit d05ff81732e20e6f9d6d7a6281a96a312b001abb
 +	* 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.
 +	+ commit 243f90afba87e99ca42e2451ac5cc59d00a044ac
 +	* g10/trustdb.c (tdb_keyid_is_utk): New function.
 +	(add_utk): Use it.
 +
 +	dirmngr: Allow building with libassuan < 2.3.
 +	+ commit a79045e38d239a7f6e787cf7c1132772c737cc0e
 +	* 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.
 +	+ commit 85bd7d9491f8cc13c2b03f19b4f70ea13b45c704
 +	* 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.
 +	+ commit 485e0a221deb5c68f29b6a7a110b349dbe41c027
 +	* 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.
 +	+ commit 5055b617a94587580bc16a56bb82333077b05693
 +	* 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.
 +	+ commit 42571a38344e39f747315f754700a8181b8744fe
 +	* common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
 +
 +2015-10-20  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Prefer ADNS over system resolver.
 +	+ commit 58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9
 +	* 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.
 +	+ commit c83b627174f46e841f1ccc018322fe499969c267
 +	* dirmngr/http.c (connect_server): Fix called function name.
 +
 +	build: Allow building without SQLlite support.
 +	+ commit 734c61dc9d4915605816803182c9adcc1594e008
 +	* 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.
 +	+ commit 26d457c218c2e93b2e2cf316f0c1074c70894d0f
 +	* g10/tofu.c (opendb): Don't die immediately if the DB is locked.
 +
 +	gpg: Improve output.
 +	+ commit bc9ff6c85e2d89be4ee873b8a72a214759a66157
 +	* g10/tofu.c (get_trust): Also show the binding when indicating a
 +	conflict occurred.
 +
 +	gpg: Synchronize translation template.
 +	+ commit 251c070f91e2c65baa3f1195f14a176440a8aafa
 +	* g10/tofu.c (show_statistics): Synchronize translation template.
 +
 +	gpg: When showing conflicts, also show bindings with no recorded sigs.
 +	+ commit d3eca517745a862432fcfeaa729e5333b15ffa6a
 +	* 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.
 +	+ commit 445f94bc81b20959a667a4ad80ea6c73059540bf
 +	* g10/tofu.c (show_statistics): Improve text.
 +
 +	gpg: Use the right variable to display the information.
 +	+ commit 4957e3236796979b58f35628351505ea5f4e936a
 +	* g10/tofu.c (get_trust): Use the right variable to display the
 +	conflicting key.
 +
 +	gpg: Make failing to create a directory a soft error.
 +	+ commit eb8a0b051faa03584b3820200e10301936e82f51
 +	* 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.
 +	+ commit c3bb9fccb7963a0918b9ec6a4f10d568fac7c125
 +	* 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.
 +	+ commit d1a0b520b15bb941cdbf66c2e832c617af778ac8
 +	* 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.
 +	+ commit 4e42ad300b3de9fab25095a9e82431b1ea2740e7
 +	* 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.
 +	+ commit c37621166e9cc2a818de73bc99287a393dbb5744
 +	* 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.
 +	+ commit a608ee750dd83bf77a5fb4f0ab5bcf812436ba4d
 +	* 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.
 +	+ commit 0433e667029508d6933e8798d3d95bcdde70a7aa
 +	* 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.
 +	+ commit 547a1b3fb881bb8581d03dbf4eacf49163eaa4b5
 +	* 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.
 +	+ commit b98939812abf6c643c752ce7c325f98039a1a9e2
 +	* 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.
 +	+ commit 76afaed65e3b0ddfa4923cb577ada43217dd4b18
 +	* 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.
 +	+ commit 6983fd131f648ba4acd57b266de9868911874d14
 +	* 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.
 +	+ commit 8c609eaf35b547f02979ef0b206520dd0853b294
 +	* 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.
 +	+ commit 253afa244487dd8129816615ac2865c9fe812aaf
 +	* g10/tofu.c (get_trust): Fix formatting.
 +
 +	gpg: Don't forget to free some memory.
 +	+ commit e56a116f9a1171ccf8b3293887a217953a46fc20
 +	* g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
 +
 +	gpg: If a conflict occurs in batch mode, record that.
 +	+ commit 55d88454652543c98d74376977d855e394df6c92
 +	* 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.
 +	+ commit c2c400714854d5a127a6966200d345d0d6cfc7d4
 +	* 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.
 +	+ commit 558bcd43ae0a841cf1e58e06f5d72a19d5bc70cd
 +	* 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.
 +	+ commit e64c805b0c270d859ddf2c35d573110cf25e8d48
 +	* 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/.
 +	+ commit 5aa1b392b1bf6fcf4cd380862c5affac39a4f34d
 +	* 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.
 +	+ commit 128a456e775edf393d47e40bb9ae8b62434e2978
 +	* g10/tofu.c (get_trust): Fix assert.
 +
 +	g10: Add TOFU support.
 +	+ commit f77913e0ff7be4cd9c6337a70ac715e6f4a43572
 +	* 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.
 +	+ commit 93e855553eba03f5c31682e0aaf39f18f29860b7
 +	* 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.
 +	+ commit 3de5ef759895837fe499cff7fb1fa7798e6d5754
 +	* 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.
 +	+ commit 0b4ebc398cc8aad3f25f84034cd6b129e55f1368
 +
 +
 +2015-10-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Try hard to use MDC also for sign+symenc.
 +	+ commit 4584125802be11833a5b289e864b45eedc2b45fd
 +	* 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.
 +	+ commit 086b8738f71ba26d36287db81f6d78116053ba66
 +
 +
 +2015-10-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: simplify agent_get_passphrase.
 +	+ commit 5a12c45666cd16bc750d7f0e63620c295feb77ea
 +	* agent/call-pinentry.c (agent_get_passphrase): Simplify.
 +
 +	agent: fix agent_askpin.
 +	+ commit 818fa4f71e1056831b35d0f8aff715c0e1d537e6
 +	* agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
 +
 +	agent: Fix function return type for check_cb and agent_askpin.
 +	+ commit f70f6695368444d8058305ab696e5e5a1bace18c
 +	* 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.
 +	+ commit ea079d283de6bf4ac70d7530fac70938e7c5e8f5
 +	* 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.
 +	+ commit 4c298525903f844eee95ecbcdc45f5ac034fa148
 +	* 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.
 +	+ commit d7b8e76f9930750d669405dee3108c9bc8e87b91
 +	* 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.
 +	+ commit b6d621583fc9cbda6f9376a24f2f4cf11499a4fd
 +	* 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.
 +	+ commit a400958323d93036dca9c63135b167012ea64f8b
 +	* 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".
 +	+ commit 9ac31f91b10059474da1c9580fb99e94278d4c11
 +	* 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.
 +	+ commit 264a81d82737369ee8beef771cf2bd2cd874320a
 +	* dirmngr/server.c (cmd_dns_cert): Add option --dane.
 +
 +	dirmngr: Improve DNS code to retrieve arbitrary records.
 +	+ commit 211b8084ee4391baec35e8c5bd75a9ecbcb889a7
 +	* 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.
 +	+ commit 6cf80dc77ec5df3722924301ff4be2475966937b
 +	* 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.
 +	+ commit 7faf45effcd47d2d04d35090a1e01a1dbb99ec70
 +	* dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
 +	(cmd_reloaddirmngr): Use check_owner_permission.
 +
 +	dirmngr: Do tilde expansion for --hkp-cacert.
 +	+ commit 9db6547a00cded92c00c8f8382b1b605be1027d2
 +	* 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.
 +	+ commit 625e292108cc0fd9077769587a8c22abe7805e33
 +	* 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.
 +	+ commit 4a5bd1720f5a3dbb26f5daeb03725cae29be7e24
 +	* agent/pksign.c (agent_pksign_do): Use public key smartcard.
 +
 +	agent: Fix non-allocation for pinentry_loopback.
 +	+ commit ce2a84b58833fd308d5fe11756721f39c953280a
 +	* 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.
 +	+ commit f3959f14b6c496c726bbca5230becb7b6844a234
 +	* 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.
 +	+ commit ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac
 +	* 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.
 +	+ commit a48e6de603c3a312f02b1b5fdb813032eeae9074
 +	* 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.
 +	+ commit 438730323a5d9bbf8dd5cd60d479b6c03f8721d0
 +	* 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".
 +	+ commit c6400c1aa82239f1c154ca27596600cae964515d
 +	* 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.
 +	+ commit 75c64c2b6d77856b90903cc3b7c6a2f62ff8eb7b
 +	* dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
 +	after realloc.
 +
 +	agent: Fix alignment problem with the second passphrase struct.
 +	+ commit ddf9dd135acd2b3635bb986f6dfc0e4e446d5fad
 +	* 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.
 +	+ commit 2acceba5cc299796c7b5b1851a9baeb75d9f32a1
 +	* 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".
 +	+ commit 2c60663a72f090573c4869e305b098b4b1fb23bd
 +	* g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
 +	packets.
 +
 +	gpg: Add debug helper to --edit-keys's check sub-command.
 +	+ commit 13a3f65968f4a8205ca664cc46b1a53de4dc489b
 +	* 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.
 +	+ commit a9895a5a72a851c5fcc70f16d5f8f588cc885751
 +	* common/stringhelp.c (strsplit): Fix arguments order.
 +
 +2015-09-30  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Add mkdir_p.
 +	+ commit c8584a1e559bc720412e1a2fc546a54ff4517205
 +	* 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.
 +	+ commit 5576146ede40b42bc632fd9697dd429a4d1409cf
 +	* common/xmalloc.c: Remove file.
 +	* common/xmalloc.h: Remove file.
 +
 +	common: Include <gpg-error.h>.
 +	+ commit 270d3f55f9193ebda5e1b642d58daf905019914d
 +	* 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.
 +	+ commit 8ab63e4b5018044ecfb0b9910412487066886826
 +	* g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
 +
 +	g10: Avoid an unnecessary copy.
 +	+ commit 12443eafa6e19b94a8b554126423e2a5ccc2dd7e
 +	* 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.
 +	+ commit 5c067d54d349fdfb3243634789c8841515d2c28f
 +	* 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.
 +	+ commit cfbe6ba9cf1414e9aa4977e2bbaecaa43154b2ae
 +	* 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.
 +	+ commit f1effdc5ecd0cc52a28db7ae28a5c28f33486542
 +	* common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
 +
 +	common: Change calling convention for gnupg_spawn_process.
 +	+ commit 83811e3f1f0c615b2b63bafdb49a35a0fc198088
 +	* 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.
 +	+ commit 6bb7206e357acfd7276a8f1334c0f0c9cc6ed100
 +	* 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.
 +	+ commit 12ff806d1b63d08cb43d131065d51353495d9346
 +	* common/t-ssh-utils.c (sample_keys): Add 3 new keys.
 +
 +	ssh: Fix fingerprint computation for 384 bit ECDSA keys.
 +	+ commit 2167951b275bae51cf669c02547e2e7ea8fbe2ee
 +	* common/ssh-utils.c (get_fingerprint): Fix hashed string.
 +
 +2015-09-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix importing ECC key.
 +	+ commit 1542dc604b9c3e6a6a99750c48f7800e72584a89
 +	* 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.
 +	+ commit 708b7eccdef8d274bd5578b9a5fd908e9685c795
 +	* 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.
 +	+ commit 8499c4f84a664bedbdf5a5689cb02420909f1968
 +	* 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".
 +	+ commit 819bba75aaed11ecef2e274add173718358212b9
 +	* tools/gpgconf-comp.c (gc_component): Change printed name.
 +
 +	dirmngr: Add option --use-tor as a stub.
 +	+ commit c091816b4a90d7eea6f8601ec1522a0a006794e8
 +	* 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.
 +	+ commit d5a3142b8f2e5603357182f34f0b081b47eda23c
 +	* g10/call-dirmngr.c (create_context): Send option and print a verbose
 +	error.
 +
 +	http: Add flag to force use of TOR (part 1)
 +	+ commit b4bc1c8b10c7a794fa108678b80f76366a65c47d
 +	* 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.
 +	+ commit f986b23e13eaa2d7705733b4bf6b5210311f181a
 +
 +
 +	scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
 +	+ commit 6510df3a7cd2b5bf44fac1e4d50ee54b8c897daa
 +	* 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.
 +	+ commit 93d257c81952cbb08a744a9cea6749639aa32cd7
 +	* 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.
 +	+ commit 9e65bbd255c43f0e59f35b0003052234d69042be
 +	* 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.
 +	+ commit 8eb3a1797a1e7cb59a8342a8aa917756fe67949f
 +	* g10/trustdb.c (search_skipfnc): Fix dummy argument
 +
 +	gpg: Change last commit to avoid extra translations.
 +	+ commit f71ed902def81f9408d9094289d8a97abaa0f609
 +	* 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.
 +	+ commit 172af881a1cfe82dfec1c43102d6c464e67ef230
 +	* 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.
 +	+ commit 6845737736d3264d7ee8b7364d908951010084c9
 +	* 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.
 +	+ commit c31e089129c0102c1710522d71fbe1880e84d68e
 +	* g10/getkey.c (finish_lookup): Simplify logic.
 +
 +	g10: Also mark revoked and expired keys as unusable.
 +	+ commit 77c2ad4a817c129b899708399ed2078a52b452b8
 +	* 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.
 +	+ commit 1b601de06a57c78537a336093d2531d8c58bc0d2
 +	* g10/getkey.c (get_seckey): If the key doesn't have a secret key,
 +	release *PK.
 +
 +	g10: Improve documentation and comments for getkey.c.
 +	+ commit cab581c486e1987445092b1afdf2cba1f62d017d
 +	* 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.
 +	+ commit 7333e704efde6923d4b914b37e9a92c4a5bab156
 +	* g10/getkey.c (have_any_secret_key): Remove function.
 +
 +	g10: Bring cache semantics closer to non-cache semantics.
 +	+ commit 5e233e12f55be00f5659c63bc32fbdca2ec93136
 +	* g10/getkey.c (get_pubkey_fast): When reading from the cache, only
 +	consider primary keys.
 +
 +	g10: Break out of the loop earlier.
 +	+ commit 3940f10af7915b080bf4ed25ceb7e20b52e3cd3e
 +	* 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
 +	+ commit 50affffe93a07643f2610c7a5f3d6f61988855e8
 +	* 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.
 +	+ commit efbaa8f891812e13ae9e689299aa2cd51781ccb3
 +	* g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
 +	* g10/getkey.c (get_seckeyblock_byfprint): Remove function.
 +
 +	g10: Remove unused function get_seckey_byfprint.
 +	+ commit e2b300801ed7143fa924df5442ec2b61079c0bbb
 +	* 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.
 +	+ commit 80dbf8006ffe52e77930b0a6dca9d8caba8c3fd5
 +	* 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.
 +	+ commit dc69804ab0576fbc87297215d63b37a680d74d4d
 +	* 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.
 +	+ commit 911fcca36d61afd061e9e6dc0584bb069353db89
 +	* 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.
 +	+ commit b4672e4d48fb1e1e4d17551c4c828763d1dfbb57
 +	* 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.
 +	+ commit 65e58ae6748c280c8633d2ca5f227ebe1220805d
 +	* 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.
 +	+ commit be6743b2e19241f66148bf89c3442d8e2ebcd63e
 +	* 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.
 +	+ commit 9acbeac23668a1d0dabca27d7825430d76e095c2
 +	* 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).
 +	+ commit 83e17ab1b4cf4420f2abaf9e1f4017a9473fb281
 +	* g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
 +
 +	g10: Remove unused function (get_pubkey_bynames).
 +	+ commit b06f96ba4f57f55194efcd37a0e3a2aa5450b974
 +	* 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
 +	+ commit d47e84946ee010917cfc3501062721b74afbb771
 +	* 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.
 +	+ commit c110e186e07fb1035dc757d322274f939df1c86d
 +	* 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.
 +	+ commit 3798f73c07f33576bd02ba4a3256c626bd80752f
 +	* 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.
 +	+ commit 7d5999f0964c9412c0e18eb1adefdb729be68cd4
 +	* 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.
 +	+ commit faee25e670cfeb0d0166d7c59cc6a0b3842ee34d
 +
 +
 +2015-09-10  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.8.
 +	+ commit 311816f6cf9d411dba060603e3c5d01c72824645
 +
 +
 +	tests: Silence the 5gb-packet test.
 +	+ commit 7a0c3cc760367024305d23e2124ea4cbc7e802df
 +	* tests/openpgp/4gb-packet.test: Send output to /dev/null.
 +
 +	g10: Fix make distcheck problem.
 +	+ commit e92a8ab021672b19e5cd397fa555fcc8a3401e8b
 +	* 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.
 +	+ commit fbf24cd09abcdc3dec21db4114ab2db99ce21e4c
 +	* 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.
 +	+ commit 19545e3a2d2990cba6d62f98cdb1f665b38ba4f1
 +	* 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.
 +	+ commit f10b427d0e2be333776fee2df8150145da36e587
 +	* 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.
 +	+ commit fd689e85423d0d80d725f0315c52d94f0e9766f8
 +	* 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.
 +	+ commit bd0c902f1de46eda03a065da41487e7e01ab4c50
 +	* 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.
 +	+ commit 1f03d4cd940fed26fc3ffa1742728d68c55ee5d1
 +	* 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.
 +	+ commit ee7ec1256b24dc340656c331ef92fc59cad817b6
 +	* 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.
 +	+ commit 60bc518645d3acfd4dcb79e61a2be6ce001e93aa
 +	* 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.
 +	+ commit f076fa190e09eab5c586650d81e241e0bb85ce25
 +	* 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.
 +	+ commit 219de84df9a8408fffedbb2600f5eb4c441950b6
 +	* common/t-iobuf.c (main): Reduce verbosity.
 +
 +	iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
 +	+ commit f2d75ac7dc58f5ea59b231be6b83fea939b43ab8
 +	* 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.
 +	+ commit 5ff5e72b9c275fbd978136b1028bbf251af26e57
 +	* common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
 +	IOBUF_OUTPUT_TEMP.  Update users.
 +
 +	iobuf: Use a first-class enum.
 +	+ commit 24259d856b6cbdd679035512a8fb7c042de8f02e
 +	* 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.
 +	+ commit 8522cdc2264804d0677b7c0a447a0b45cf4195e3
 +	* 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.
 +	+ commit 9ba4ccdaf5e128fbea51ff142c63d4b359c7264d
 +	* agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
 +
 +	gpg: Remove option --no-sig-create-check.
 +	+ commit f9c83d84e7d33df76898975f5ac852efa9c4882a
 +	* 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.
 +	+ commit 99c9bf7defd6c1ac9cc49c84e6c78eeb886a6952
 +	* common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
 +
 +	common: Fix regression in building argpase.c standalone.
 +	+ commit bc23e69b70191f887dcb937007833d0187af181f
 +	* 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.
 +	+ commit 04a6b903d0354be2c69c7f2c98987de17d68416e
 +	* 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.
 +	+ commit 360b699e9b4b8f99bd790b3cd158cd6f0fd7c131
 +	* 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.
 +	+ commit efd1ead9e779eb3bd37384258e08ad921a934612
 +	* 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.
 +	+ commit 11d8ffc939a4d20cfb0082b2d966b1e1a7d61f8d
 +	* g10/keydb.c (keydb_search_first): Reset the handle before starting
 +	the search.
 +
 +	g10: Remove unused parameter.
 +	+ commit 0377db4b3581561b1ffc5bb7c3b4d698e8993b3a
 +	* 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.
 +	+ commit 135b1e32f01beaceba8a4ecc774e23b56aca1d24
 +	* 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.
 +	+ commit fad91071cadff43d77ce2e524dfb03999ba6678e
 +	* 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.
 +	+ commit 9d07f6930aaa40dce92104e8c99241713d92eed2
 +	* configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
 +
 +	gpg: Emit ERROR status for key signing failures.
 +	+ commit 51b9b8fba4ee326013c2cc911c70cde4c5f81fc7
 +	* 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.
 +	+ commit 9cdff09743c473a12359bfdb914578ede0e4e3e2
 +	* 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.
 +	+ commit 348a6ebb63523305ce9f47d0f3e8a9086c338fed
 +	* 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.
 +	+ commit 3cf02192a890d04f8f558cb72d46f9bd7a378322
 +	* 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.
 +	+ commit 84f4c8811fc5bdd78693c4dc289389a8337cc257
 +	* dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
 +
 +	gpg: Fix regression in packet parser from Aug 19.
 +	+ commit 88317ae8c829bfeb1689415efbd32b7a232d7bd0
 +	* 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.
 +	+ commit 00def10d365a88ce2d034ea9a5d6be4b03285fa4
 +	* 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.
 +	+ commit 09f2a7bca624d0492e1d7ab29ce19542249c13ff
 +	* 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.
 +	+ commit 4f37820334fadd8c5036ea6c42f3dc242665c4a9
 +	* 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.
 +	+ commit b3226cadf9bbef4a367072396e5b0abf37afff2d
 +	* 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.
 +	+ commit 0143d5c1ca4d12ac252c14f01931f48131591065
 +	* 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.
 +	+ commit 48e792cc951a9d00fad0691ef7411c9e22cf675a
 +	* 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.
 +	+ commit 73af66a0aada8f30d8f400fdc4f69e233fb53089
 +	* 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.
 +	+ commit 0d5a4138f27187e7828ef8216758edc9b48b2c64
 +	* 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.
 +	+ commit 0add91ae1ca3718e8140af09294c595f47c958d3
 +	* g10/parse-packet.c (parse): Be more robust: make sure to process any
 +	EOF.
 +
 +	g10/parse-packet.c: Replace literal with symbolic expression.
 +	+ commit 24a72dffa75a04611c98343140c4eb0fbfe2a59f
 +	* g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
 +	buffer's size.
 +
 +	Add documentation for g10/parse-packet.c.
 +	+ commit 026feff4a8e3090fb152af72c73aaa80c78e4551
 +	* 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.
 +	+ commit c46e8bfe9a1ae3f1e5327d0451cffd6e4567b449
 +	* 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.
 +	+ commit c271feb53664dbf2b4ccbae90a31b8e726481e2d
 +	* 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.
 +	+ commit 49f922286fa8adb2d2ca730eb7bbe67e684b20de
 +	* 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.
 +	+ commit c5da750cf3d53277fe6d86776bfe0d2304b05151
 +	* 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.
 +	+ commit e291b631c3b1aedf529078190cd51e2acfcd1d92
 +	* 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
 +	+ commit a6d4bca3b576c3c5dba1aa6e8c1039089e14147b
 +	* common/iobuf.c (iobuf_write): Don't write a byte at a time.  Use
 +	iobuf_write.
 +
 +	common/iobuf: Improve documentation and code comments.
 +	+ commit 1bfd1e43246c16e20f819bf5381ca21abde54458
 +	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.
 +	+ commit 0d40c4e83f6fbfea2f494f1f88412d3132ff98bd
 +	* 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.
 +	+ commit 827cc922d84d8113d4f13ebbed1314e03da5f7d2
 +	* 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.
 +	+ commit 616181f3c757160af8539869a6d929faca4962c4
 +	* 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.
 +	+ commit 15ae99f887f4694de8468625d455d487d283f719
 +	* 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.
 +	+ commit 8402815d8e0e04a44362968f88b3d484d2395402
 +	* 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.
 +	+ commit 6d49a2b6691f2dd0d8ac34a15f18cc2a0c3ba5d3
 +	* 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
 +	+ commit 1f94646a86348128f585301fcd605e5e703fd77d
 +	* 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.
 +	+ commit a250f73783c06d7789ac65a395d9247f4ab44c26
 +	* 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.
 +	+ commit c7ad36eb0d7f872fc15e793aa1d0b6b89bc471d6
 +	* 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.
 +	+ commit e76c75d8726558dc9084710253f0f6780e06fad3
 +	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.
 +	+ commit 4e32c602f5c40cca5f8f40e642ccb10d3f8c5614
 +	* 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.
 +	+ commit fa9fda23c2c8cf6982b7263f6882ed8687d98c16
 +	* 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.
 +	+ commit 75fd86bbd175e085a93c1ad62f50ae936494b307
 +	* 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.
 +	+ commit 679acc671e621847f50d6b4dca10a22c62500b9a
 +	* 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.
 +	+ commit 12fc56bcb51d984a6e86fc1eb7952f9976c67043
 +	* 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).
 +	+ commit e8c0b6abf88309c23a70df0abbd38d42fa22a786
 +	* common/iobuf.h (struct iobuf_struct): Remove field directfp.  Remove
 +	all uses of it.
 +
 +	common/iobuf.c: Remove dead code (opaque).
 +	+ commit f05d60b3813a97e316a067680d7598b74621a522
 +	* 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.
 +	+ commit c06eabac8e85f7f79414363836f093415e8da62e
 +	* 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.
 +	+ commit 91357b7722f2bf0d3765ec72855bdc96732df9d6
 +	* 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.
 +	+ commit bba74cdd95ea98b5a7c3a12823b229341e91504e
 +	* 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.
 +	+ commit 93f5295df512269dd8fecbd649b11cbacf78e864
 +	* 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.
 +	+ commit f126ca61565922b3b938c3486614b9bd7e6e454c
 +	* 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.
 +	+ commit 233b5fedabd80a34452e748132e65b5944310428
 +	* 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.
 +	+ commit b5e081973b56b21214fc0c65ba9015dd026328b4
 +
 +
 +2015-08-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: fix ECC key handling.
 +	+ commit 8704c70108218a60f8fb2ee0e558ca8ed125600d
 +	* 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.
 +	+ commit c80643c5ecbee89f343ef087313870cee1334fe4
 +	* 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.
 +	+ commit 5b7a80b1ab91d2f199065e5dd14e85f42918975d
 +	* 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.
 +	+ commit a68c5c5c7fe4ec8665e252e5062292f6c7b94fdd
 +	* 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".
 +	+ commit 9f31ab3d216ed74d6f392a62e3f95e0591174119
 +	* 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.
 +	+ commit fb754dc6170d12edf3d35c48340b8d7b1ded20f7
 +	* g10/keylist.c (list_keyblock_print): Do not print extra curve name.
 +
 +	gpg: Add commands "fpr *" and "grip" to --edit-key.
 +	+ commit fbb6c25ab5dbb5f2b1f1eb342ca7caa3f955d8c9
 +	* 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.
 +	+ commit 969542c8c2f48a60c1d68b7bf70b0c00374bacba
 +	* 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.
 +	+ commit e5891a82c39997b65ce9ff90eb6120db7bedd399
 +	* 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.
 +	+ commit a6e40530898622fbc5d76557a7da5e69368ecaa4
 +	* 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.
 +	+ commit d088d2c81690a89051349ddc8a82fe222625f4e0
 +	* scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
 +
 +	scd: Fix ECC support.
 +	+ commit 0751571cac0f5aef2862c34a184f7f09ad9cb203
 +	* 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.
 +	+ commit 4a326d7c9a3b09efcccf4de00d6c003829ad89e8
 +	* g10/keydb.c (keydb_search_fpr): Skip legacy keys.
 +
 +	gpg: Properly handle legacy keys while looking for a secret key.
 +	+ commit f05a63b10428df2878b1bb6fde57a2fc2aa99105
 +	* 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.
 +	+ commit 328a6b6459a5ce4a70b374262f221ada20c40878
 +	* 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.
 +	+ commit 23d8609f4b5ec3432323a676fd7ef225c0ef71a1
 +	* g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
 +
 +	gpg: Indicate secret keys and cards in a key-edit listing.
 +	+ commit 8b2b988309cbc5af339beb0a55ff71d7464eb646
 +	* 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.
 +	+ commit 7ef09afd1a6a37c7f22e7c3d898f0c917b08f940
 +	* 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.
 +	+ commit 4bc75337f31374b7424d7bdebf839dd91ec80c0a
 +	* 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.
 +	+ commit 18f1e627c697d75175b79fe095305fa775f20841
 +	* 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.
 +	+ commit 55e64f47a52d76e097a01eb4044a88a4e10d6a87
 +	* scd/app-openpgp.c (ecc_writekey): Use extra var n.
 +
 +	Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
 +	+ commit d382242fb6789973ce8d246ec154a4a1468c24c0
 +	* 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.
 +	+ commit ef080d5c7fb7f3b75c3c57c011f78a312b8e13a9
 +	* 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.
 +	+ commit d24165bce2823c2f5dcb39b7b84c9aa00802a8ee
 +	* 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.
 +	+ commit dbf4534f49a1fe3823bd6d6d7bb4d9df863b4789
 +	* 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.
 +	+ commit 69d2c9b09bd9d0b86b9f2feb585037a2c11795b0
 +	* 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.
 +	+ commit 9901be395684dd1b35d83685a719291347684ab1
 +	* 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.
 +	+ commit f5d356fb5bbbd0e05a753612455253e4bc335266
 +	* 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'.
 +	+ commit f2ee673c99825d5189631031ddec2dbf54dbd482
 +	* 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.
 +	+ commit b3286af36d452fc801be573a057b0838d53a2edd
 +	* agent/agent.h: Use ENABLE_NLS and define L_() macro.
 +
 +2015-07-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Remove unused files.
 +	+ commit 67b2dc7636e47baefd5aafe0eb45b4730f974481
 +	* 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.
 +	+ commit 5b46726931049e060d8fbfa879db7907078a9aed
 +	* 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.
 +	+ commit 1be2cebf7ff5837c8b548b4f4afbf1b8b28211bc
 +	 * 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.
 +	+ commit 3502b3cc0f5ff92ab89a0da8b1e344a8ad615737
 +
 +
 +	scd: Support AES decryption for OpenPGPcard v3.0.
 +	+ commit 45c49a0030c7a01ec011ce810ddb3aaef734e9bf
 +	* scd/app-openpgp.c (do_decipher): Support AES decryption.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.6.
 +	+ commit a499eeb6a6545d87ac9f1b64e32017bfdb4f67e6
 +
 +
 +2015-07-01  Daiki Ueno  <ueno at gnu.org>
 +
 +	agent: Unset INSIDE_EMACS on gpg-agent startup.
 +	+ commit f1490a3a0ecf4a5a03373c9563f7709630232ee3
 +	* agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	common: Implement i18n_localegettext.
 +	+ commit a65447f0d64d0c53ddbdcfc988f26ecc9a8a6f08
 +	* 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.
 +	+ commit 816824953c91959c23a57c047bdba6a902ffdde6
 +	* 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.
 +	+ commit 232af382e563fcbe15589a3ccae7d6908a17c44d
 +	* 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.
 +	+ commit e76d4c05b24211f3981ab69cddb3fccc17d21e0e
 +	* 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.
 +	+ commit 010e4281c3e15e2f86589dd1da419531ead519ef
 +	* 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.
 +	+ commit b6076579311029aa76c00377d9a804b1578bf58f
 +	* 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.
 +	+ commit 2778c6f8f40d73272075ce04c07097f65c94054e
 +	* 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.
 +	+ commit 0416aed4abf6cea94458d2e38eb4a5e6bfea2d8b
 +	* 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.
 +	+ commit 60cf69ff9d61a2cd37fc4468f232fd41aa70a651
 +	* 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.
 +	+ commit 68c217f457a772984d0afbdd341f18de7c867505
 +	* 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.
 +	+ commit 9bca96dbc5c32bdd00196462fde8c9ab94aeb28d
 +	* agent/command.c (cmd_passwd): Add option --verify.
 +
 +	agent,w32: Do not create a useless socket with --enable-putty-support.
 +	+ commit 7a387331645736eaeaaef57770beef5fa741bc22
 +	* 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".
 +	+ commit 2c9c46e2a2b8f9a1bdc1ef46a135b5fc7d1a8073
 +	* 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.
 +	+ commit d2fdf2e1b6cd447bb1c36df0ac7d8e669802fa22
 +	* 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.
 +	+ commit 5e1a844ae9b6730b4b8a2c9178ea9bc121560c28
 +	* 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.
 +	+ commit 54a0ed3d9b10a3c6dfb3d6a4d20b693a3183f8f6
 +	* 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.
 +	+ commit 8195e55d0c134a45f7c9bd95c8b5741781841c18
 +	* 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.
 +	+ commit 5e1d2fe6555d06f9dcd2daac713b2edfbc0428a5
 +	* 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.
 +	+ commit 4698e5b203bd983503b5fd784fcd09dd3bc3a15e
 +	* 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.
 +	+ commit 22147952b744958ec46d356e942540356ff7d93e
 +	* common/miscellaneous.c (parse_debug_flag): New.
 +	* common/util.h (struct debug_flags_s): New.
 +
 +	common: Add function strtokenize.
 +	+ commit d37f47081d41584efc0c397432811f9cfa5d5867
 +	* common/stringhelp.c: Include assert.h.
 +	(strtokenize): New.
 +	* common/t-stringhelp.c (test_strtokenize): New.
 +
 +	gpg: Fix regression due to recent commit 6500f33.
 +	+ commit e0873a3372800d51c90ca656450f937dbae9c169
 +	* 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.
 +	+ commit 444e9232aa9e00aacd939cbf7bdb881b550dfebe
 +	* 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.
 +	+ commit 0948c4f217308ffa0ec61ce189d387fd61b02bbd
 +	* 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.
 +	+ commit 6500f338a35f4148606480c79f3a0c1b0d15f13a
 +	* 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.
 +	+ commit 53e9b86085ac70ede8a0b1de9018ccbfe55b0932
 +	* g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
 +
 +	gpg: Print available debug flags using "--debug-level help".
 +	+ commit 663a31f1ea2fc5a43c822e916cf20fece5243851
 +	* 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.
 +	+ commit c5604eeee4b64a44a1ca1d517ace14fc1cbda298
 +	* 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).
 +	+ commit c97198371b7307e64afdd323231977b2247f64ec
 +	* 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.
 +	+ commit 010d26a85bfe15c4aa12eefeab851dbde0609c26
 +	* 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.
 +	+ commit 685b782a18adb90bbf78956682e4e7f89fed678c
 +	* 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.
 +	+ commit 82c72e2db7bc5b633768d59822f2e2a353fa6e32
 +	* 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.
 +	+ commit eac081ba1278855fa223b031b527498fec558bc7
 +	* 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.
 +	+ commit 15540f6233bd041b06708862a6d9535cbcabe330
 +
 +
 +2015-06-15  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add defs.inc to BUILT_SOURCES.
 +	+ commit ef273a9afc7840b75cfb9b8af78d117b7d672c6a
 +
 +
 +2015-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.5.
 +	+ commit 9b7bdfae82f74a147a5dbf0fac0f78cde77a207b
 +
 +
 +	agent: Fix --extra-socket on Windows.
 +	+ commit 985918aab025cf0ac9db411b88a47c4b985e5e95
 +	* 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.
 +	+ commit 008435b95cbca19adc217178dc9d793eca584345
 +	* 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.
 +	+ commit 691dae270b3b741178912599724d69adabdb48b9
 +	* 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.
 +	+ commit 25331bba5554a39d226d32433add7784b2e170b8
 +	* 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.
 +	+ commit 255dadd76d5a2101d2c5450741326b67253fa9ea
 +	* 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.
 +	+ commit abbefdd04d7ee30218506caeae1fd858569c9f0a
 +
 +
 +	Convey envvar INSIDE_EMACS to the pinentry.
 +	+ commit c672572bd50966187cc823585efed673b66ff942
 +	* common/session-env.c (stdenvnames): Add it.
 +
 +	agent: Add command "getinfo std_env_names".
 +	+ commit 8425db6a26bf66dad16dfbc26be9af7d272f31d3
 +	* 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.
 +	+ commit cf508a1f7f4c8926dc554be68a2d46f5ce272ac0
 +	* 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.
 +	+ commit a4a15195c2a3729025a3ba3439ac8860083fceeb
 +	* 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.
 +	+ commit f170240ef735edc481f60e51527cbb5ee1acfd55
 +	* g10/tdbio.c (tdbio_read_record): Fix returning of the error.
 +
 +	gpg: Fix output in case of a corrupted trustdb.
 +	+ commit bf06d04f53296f4b4b73b9360cf1571559bb2295
 +	* 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.
 +	+ commit e5c69e87beebe99d362ac721ce4ea6b057a30a99
 +	* 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.
 +	+ commit fe5c6edaed78839303d67e01e141cfc6b5de9aec
 +	* 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.
 +	+ commit 6cb18a8f975b7ff7ca79c1fb0cddcd4b66be90fb
 +	* 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.
 +	+ commit 23d2ef83cda644c6a83499f9327350d3371e8a17
 +	* 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.
 +	+ commit 3a9305439b75ccd4446378d4fd87da087fd9c892
 +	* 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.
 +	+ commit e201c20f25e7bed29088186c5f717d43047a0f4b
 +	* 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.
 +	+ commit c771963140cad7c1c25349bcde27e427effc0058
 +	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.
 +	+ commit 43ea8f5d884dd108bb27d8e1610fa28802295a06
 +	* 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.
 +	+ commit a67ead6525d7597a9e0b152c5971f6290f7912f3
 +
 +
 +	speedo: Add make option SELFCHECK=0 to build a new release.
 +	+ commit 21b0701e2e044894c53ff59d22c5c6a172780c25
 +	* 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.
 +	+ commit 987532b038a2d9b9e76c0de425ee036ca2bffa1b
 +	* common/exechelp-posix.c: Limit returned value for too hight values.
 +
 +	gpg-connect-agent: Fix quoting of internal percent+ function.
 +	+ commit 26e2eb98d3d8405b335b43c8e86deacf622cd957
 +	* tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
 +	escape '+'.
 +
 +	agent: Add option --no-allow-external-cache.
 +	+ commit d7293cb317acc40cc9e5189cef33fe9d8b47e62a
 +	* 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.
 +	+ commit 02d5e1205489aa5027a87a64552eaf15984dc22d
 +	* agent/call-pinentry.c (start_pinentry): Add more strings.
 +
 +	agent: Add option --debug-pinentry.
 +	+ commit 14232c3870c5ef5d2fa15e8ed3f302b1ba29d25c
 +	* 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.
 +	+ commit b03a2647299a6c8764a2574590cbaccdff9e497d
 +	* g10/trustdb.c (validate_keys): Call dump_key_array only in debug
 +	mode.
 +
 +	gpg: Fix wrong output in list mode.
 +	+ commit 7039f87375b3c89d6e63837b811ed2be71c8d9db
 +	* g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
 +	LISTFP.
 +
 +	gpg: New command --quick-adduid.
 +	+ commit 64e809b791645f343feb69112baba8e2700e454b
 +	* 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.
 +	+ commit 3c439c0447f8a7468a61bbdc4c9a101ef2451dcb
 +	* 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.
 +	+ commit b772e459fa91cdc7facd95227ebc0faba20a7003
 +	* 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.
 +	+ commit 436f2060721e997479a9dd5be8dfc73627dd49c9
 +	* 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.
 +	+ commit d0d4984cfec54dee727b9e9d33d09e33c6f2e182
 +	(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.
 +	+ commit 56b5c9f94f2e55d096be585ed061ccf1c9ec0de6
 +	* 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.
 +	+ commit 74944330ba7229ed0cbe23cc0f573962a444bd07
 +	* 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.
 +	+ commit d3b5cad2346bd5747789dc62d7804fa5c15f4f3b
 +	* 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.
 +	+ commit 874ef16e70ab750db7b153f17a7e859a0db6a2f1
 +	* 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.
 +	+ commit 173b26c8f83a3c623165a96c315bf9ed4b90edcc
 +	* g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
 +
 +2015-05-06  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Install a native pinentry.
 +	+ commit 154abaf3c97dae43ba972e4482680a287f3e5c39
 +	* 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.
 +	+ commit f77fd572db658959fa40aa8c181be919e688b707
 +	* 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.
 +	+ commit 01a2a61bc4b34817c4216888265f65d59a33dad3
 +	* 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).
 +	+ commit 172b6193488f433a206fd88f85d8c4a5d1eb7fdf
 +	* common/README.jnlib: Remove.
 +
 +	common: Rename log and gcc attribute macros (jnlib merge).
 +	+ commit 26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3
 +	* 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).
 +	+ commit 575230d91bba95697518da418ea0e8712f889a0f
 +	* 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).
 +	+ commit 17bcd087082d01c48c60ff20d7f9a40f34c6969f
 +	* 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.
 +	+ commit 154f3ed2bf64de801ae0f9796338a2767ec6357b
 +	* 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.
 +	+ commit ce11cc39ea7e011040debc9339a2310a714efe7e
 +	* 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.
 +	+ commit a7264e3a6a83189a9e43edf5e99f5ac7ee42a2ab
 +	* 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.
 +	+ commit c4d98734c5df39f57a71f0ec1c0c80e82ff08508
 +	* 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.
 +	+ commit 54e55149f2af96eff08bfd6f70ef13d007fb58c7
 +	* common/http.c (is_hostname_port): New.
 +	(send_request): Fix proxy name parsing.
 +
 +	dirmngr: Add http proxy support for keyservers.
 +	+ commit a0dead5edce07838cf5ff3ec7205a3bff2a6ef70
 +	* 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.
 +	+ commit 727fe4f8d7d5fc3eac0b0aa6fafa4a314686d7dc
 +
 +
 +	gpg: Make preferred keyservers work.
 +	+ commit ae0d65f86413a82a40cf68e08aaeca405eee8c78
 +	* 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.
 +	+ commit da1990bac71f6447d8ebd169c3b3b186e9f287d9
 +	* 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.
 +	+ commit 2180845959839705200e3172dbafc94b70b9007f
 +	* 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.
 +	+ commit 971d558e862db878a7310e06ed7116dbe36886ab
 +	* 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.
 +	+ commit 25fce93ba19d997e234a674d5cc98df82c5b5496
 +	* 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.
 +	+ commit 5cde5bf37339cdeb0bd0a33d39477382eafebede
 +	* 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.
 +	+ commit 454f60399c7318fffd3de2afadd58c7a490178bd
 +	* common/t-stringhelp.c (test_strsplit): Remove nested function.
 +
 +2015-04-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.3.
 +	+ commit b1e1959d59a12b53c016ca9c95aee3a62c0bfc00
 +
 +
 +2015-04-11  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +	+ commit 896f438967b66b4836419aa737c706ced6b6454a
 +
 +
 +2015-04-11  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update and review Russian translation.
 +	+ commit b69d7064f30c38ffe18e71de6a0fc14b5da0452f
 +
 +
 +2015-04-10  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr,w32: Make it build for Windows.
 +	+ commit c8bb5000d4c86a055348dc08352f573c599743a7
 +	* dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
 +
 +	Remove obsolete directories from AM_CPPFLAGS.
 +	+ commit 67158ff155ef52fd54a6bbe680551c0e12b31e69
 +
 +
 +	dirmngr,w32: Replace functions not available under Windows.
 +	+ commit 0fb224c2c5e0c6770d4a6044d62d84f6bbc1b26b
 +	* dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
 +	gmtime_r.
 +
 +	common: Add new function gnupg_gmtime.
 +	+ commit 5d60c7f7e05a06e46e23bafe61cef09ad32aa998
 +	* 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.
 +	+ commit f6670100b7a15b2071c2e4062f5c5a678f2a30f6
 +	* 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.
 +	+ commit 6ad95fe6f1f130c8f6d139a9bd57fc4a0d38292b
 +	* dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
 +
 +	gpgparsemail: Fix last commit (3f2bdac)
 +	+ commit 9433661419043431a6cfc7d84c8450e0b2f6c353
 +	* 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.
 +	+ commit 3fbeba64a8bfb2b673230c124a3d616b6568fd2f
 +	* 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.
 +	+ commit 6619ead2cfd2abcb95b66dc70622fdeef624fb8a
 +	* 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.
 +	+ commit c2383407bba5eefea486464a31e02846124c9da5
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
 +
 +	gpg: Prepare to pass additional context to the list functions.
 +	+ commit 67a58118ab6171c0cf28b65a39973062690d1313
 +	* 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.
 +	+ commit f577d5c1a747d673fa1d5c012ce3e3b78b699c6a
 +	* 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.
 +	+ commit c581ed717ad2cc4be90c46253baa44a0d3ba5b80
 +	* g10/gpg.c (oDebugIOLBF): new.
 +	(opts): Add --debug-iolbf.
 +	(main): Set option.
 +
 +	Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
 +	+ commit 24a75201da6be72edf85b96dbc0c01c747d02c6a
 +	* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
 +
 +	Fix use of DBG_CACHE and DBG_LOOKUP.
 +	+ commit 2f099eb62ac6491675bbcccaca4e076b2d8e7ea0
 +	* 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.
 +	+ commit 4de8a58e44262a25564e2acef8c8865d1755982e
 +	* 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.
 +	+ commit d901efcebaefaf6eae4a9b9aa8f0c2c055d3518a
 +	* 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.
 +	+ commit f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0
 +	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.
 +	+ commit 4ffadb74b3ada8a5d69ef8d87f4326df9bd97e97
 +	* 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.
 +	+ commit d0ff2ee04187fbedacbe4d3884ee75d957a0b8c6
 +	* 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.
 +	+ commit 802eec0ca49b92104c92f18c9a6a04c34de74168
 +	* dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
 +	strings.
 +
 +	dirmngr: Use a better error code.
 +	+ commit 7f6d7948c1e56e09c1bdaa5143e1b5558c4376dd
 +	* 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.
 +	+ commit 348c520040a31f5c322183c0654a34978e2baf6f
 +	* 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.
 +	+ commit f26ba14028d34845ae10aae552b90681907e377d
 +	* 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.
 +	+ commit bec10ae4b5a870303c800cdf3cd906044613fc2d
 +	* 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.
 +	+ commit 6c701af121782c2feb4ee51e559a7420df00471f
 +	* 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.
 +	+ commit 99ef9cd7f589b51921bfbe8d52735c104ef260e3
 +	* common/util.h (GNUPG_GCC_A_USED): New.
 +
 +	sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
 +	+ commit 1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0
 +	* 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.
 +	+ commit bdd22e3a0846d38a0b6cdb822476ad2f15d03455
 +	* 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.
 +	+ commit 7a56b6b3aa8b7a07bd80a3fcd5114bd1af359fa3
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
 +
 +	Improve documenation of http_parse_uri.
 +	+ commit 00a16cf49336ee0b4ce21eb05a79db955af053e0
 +	* common/http.c (http_parse_uri): Improve documentation.
 +
 +	Add support to talking to LDAP key servers.
 +	+ commit 51341badb623927f2a358588c725a356fc77dbe7
 +	* 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.
 +	+ commit 81e83060856f02f6cfc7b48f8032e0cf14fc6c68
 +	* 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.
 +	+ commit 9e79a15f74c428624b0049a3f6a077c1bc7c731d
 +	* 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.
 +	+ commit 63552852bf191985b4b55aa524bc397c5b1d1515
 +	* 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.
 +	+ commit 1a75b7c39f0a84f518711438565645a34fb2673f
 +	* 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.
 +	+ commit e23b3ba5ffd3134a72da176a039e4d6c4f3ff595
 +	* common/http.h (uri_query_lookup): New declaration.
 +	* common/http.c (uri_query_lookup): The corresponding implementation.
 +
 +	Add new function strlist_find.
 +	+ commit 79907ad256f5b84f36cbebdc92e5a05d9e266557
 +	* common/strlist.h (strlist_find): New declaration.
 +	* common/strlist.c (strlist_find): New function.
 +
 +	common: Add new helper function, strsplit.
 +	+ commit b18ffcb81a3839dbf09603d70ebb8b80f65892d3
 +	* 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.
 +	+ commit bebab54027d8c63574a2680c60481cfe9b88c240
 +	* kbx/keybox-search.c: Include mbox-util.h.
 +	(blob_cmp_mail): Improve OpenPGP uid parsing.
 +
 +	common: Add function is_valid_mailbox_mem.
 +	+ commit a0eb2e4e8cef9ca6a5dfbae6440fa6cd583d0805
 +	* 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 '>'
 +	+ commit 783a4a98378fa1aa222d5cb7427dd37151feb08b
 +	* kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
 +
 +	common: Fix syntax error when building with gnutls.
 +	+ commit 5136e39c6466de90697153ea253c4b540c1f7d1a
 +	* 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.
 +	+ commit e7ddaad0fd2c8774a1d3367adfaa68014eaf65de
 +	* g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
 +
 +	agent: Compute correct MPI length header for protected ECC keys.
 +	+ commit cf83ff01fce3ddcbde6d97dffa0db6f277588e25
 +	* 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.
 +	+ commit dc10d466bff53821f23d2cb4814c259d40c5d9c5
 +	* 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.
 +	+ commit 28bb3ab686c1c994f67a92b6846b3726c58a0bc3
 +	* 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)
 +	+ commit 6cbbb0bec98e1acefc4c7163cc41a507469db920
 +	* 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().
 +	+ commit 9078b75a73600fc6b7b5502ceee8de032bb9c446
 +	* common/argparse.c (show_help): Take care of flag value
 +	(usage): Ditto.
 +
 +	common: Allow standalone build of argparse.c.
 +	+ commit eb5f2c0af6691229300ac120ee44815cb27ed38e
 +	* 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.
 +	+ commit ab17f7b6c392782718f57eaea94fc18a0ff49389
 +	* g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
 +
 +	gpg: Allow printing of MPI values in --list-mode.
 +	+ commit bcc8250bc5b9a357c6d1444f03e334edec573ede
 +	* 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.
 +	+ commit 8bc1debfefb7cd4b0be724317793d59dea37d677
 +	* 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.
 +	+ commit 1a9f13bc663daa75c5009f6a0bf7d7483f12cce0
 +	* g10/encrypt.c: Change condition for detecting a real file.
 +
 +	g13: Fix pointer wrap check.
 +	+ commit 4bc3a2e954afc2ba7dbe79ba5f740184b7d4cd73
 +	* g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
 +	doing an overflow check.
 +
 +	agent: Remove useless conditions in command.c.
 +	+ commit 3a35c9740ab792068ec4b3732ecfaa17bf4fc7f0
 +	* 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.
 +	+ commit 3529dd8bb5bafc4e02915648d5f409bd27a9cc37
 +	* agent/command-ssh.c (ssh_search_control_file): Check S before
 +	upcasing it.
 +
 +	agent: Remove useless conditions.
 +	+ commit 95415bdec77a608e6052ba3e2a5d857a8e8f7689
 +	* agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
 +	* agent/command-ssh.c (ssh_identity_register): Ditto.
 +
 +	gpg: Remove useless condition.
 +	+ commit c59b410cf1d5676de7061e5a183c01227aa8e760
 +	* g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
 +	(list_keyblock_print):  Likewise.
 +
 +	scd: Fix possible NULL deref in apdu.c.
 +	+ commit ef0a3abf7305133d071bf1a94a7f461082f9a9aa
 +	* scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
 +	(control_pcsc_wrapped): Ditto.
 +
 +	common: Make openpgp_oid_to_str more robust.
 +	+ commit 35db798c2df7f31b52a9dd9d55ea60ae1f325be9
 +	* 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.
 +	+ commit efde50f92af241d8357db83e280a6ece62f6397f
 +	* 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.
 +	+ commit 7b5b52f3268b093eebbac3f199fb69bf246d9cd1
 +	* 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.
 +	+ commit 14af2be022ccaf826db048fc16959d0222ff1134
 +	* 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.
 +	+ commit bb5a1b7c738d74d5b46340ec7b50000a2d343ca9
 +	* 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.
 +	+ commit 82146af85b65498a69b28913593dc1ffeb6b6fed
 +	* 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.
 +	+ commit c071be698efadef1ad01fd3d329d1b486a372927
 +	* common/stringhelp.c (ascii_strlwr): New.
 +	* common/mbox-util.c (mailbox_from_userid): Downcase result.
 +
 +	gpg: Fix memory leak due to PKA lookup.
 +	+ commit 91baea2dcde6c1e5ca9e8fa7020d9ab4551d1bca
 +	* 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.
 +	+ commit 2fc27c8696f5cf2ddf3212397ea49bff115d617b
 +	* 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()
 +	+ commit af60152a4632ef26ca950a424429b15b6c69038d
 +	* 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/.
 +	+ commit 9913253610bac69e9503800e85696491e018e327
 +	* 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.
 +	+ commit e2d93402801a2cb822c723e891fd98233fdb3fd5
 +	* 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.
 +	+ commit 93fa3d5c1760f3fee5412fb29d58fbd60db16ea9
 +	* 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.
 +	+ commit ae09515b9d3aae653b62a32ea5b4a9b9e557fc52
 +	* 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.
 +	+ commit a8116aacd91b7e775762a62c268fab6cc3c77438
 +	* g10/getkey.c (search_modes_are_fingerprint): New.
 +	(lookup): Skip over legacy keys.
 +
 +	common: Fix regression due to commit 2183683b.
 +	+ commit d9f6eea6115df7959564123eb99d633ce5bba42e
 +	* 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.
 +	+ commit d2a70fd8348d6c11d1960caf2afe0701833dad6a
 +	* 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.
 +	+ commit 76c8122adfed0f0f443cce7bda702ba2b39661b3
 +	* 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)
 +	+ commit 07a71da479daaac43b8c5b1034a1e66f96bdbc48
 +	* 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.
 +	+ commit 070d7bf940efa60db2b0734273b9b3736d18338a
 +	* 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.
 +	+ commit fc17562cc4f8d531ae7f0887cf2a96dcc224b021
 +
 +
 +	dirmngr: Avoid warning about unused function.
 +	+ commit 8219c87c301ec669f07528e8d8108655f7b705be
 +	* dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
 +
 +	build: Update standard build-aux files.
 +	+ commit 81e93e251e52e427a29556de75640c7933bb5aad
 +
 +
 +	Use inline functions to convert buffer data to scalars.
 +	+ commit 2183683bd633818dd031b090b5530951de76f392
 +	* 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.
 +	+ commit f0f71a721ccd7ab9e40b8b6b028b59632c0cc648
 +	* 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.
 +	+ commit 0835d2f44ef62eab51fce6a927908f544e01cf8f
 +	* 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.
 +	+ commit 39978487863066e59bb657f5fe4e8baab510da7e
 +	* 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.
 +	+ commit 0de5c6a9a783ed9dc69cecbf34eadcaace4be243
 +	* 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.
 +	+ commit 05428d12561bc7eb872a81444918dfe706477a41
 +	* 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.
 +	+ commit 3f67426a89bf4b37e1d2662fddc3eb4fa474c4ad
 +	* 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.
 +	+ commit 8872657b2a52dd9698224b80e5672e23c5405eda
 +	* 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.
 +	+ commit 616633b7713081ecc39419494879947cc7f163d0
 +	* 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.
 +	+ commit 7db6c82cec49b7c56c403a8ea98364086baf75f3
 +	* 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.
 +	+ commit 6ab0fac575a8b04152a199cb300a08436b096753
 +	* 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.
 +	+ commit 6c368533f5211bed62e8638f522cef65c7ba4b87
 +
 +
 +2015-01-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit the size of key packets to a sensible value.
 +	+ commit 382ba4b137b42d5f25a7e256bb7c053ee5ac7b64
 +	* 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.
 +	+ commit d8eea25b8b7becbfa3f059be6f5966a2f1aa7112
 +	* 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.
 +	+ commit 0c2bfd9d5a49a6134188f8f7820f6ccdebd9f181
 +	* common/init.c (early_system_init): New stub function.
 +
 +	gpg: Allow predefined names as answer to the keygen.algo prompt.
 +	+ commit b1d5ed6ac842469afcb84868d0f6641dc286a6c7
 +	* g10/keygen.c (ask_algo): Add list of strings.
 +
 +	agent: Add some extra robustness to extract_private_key.
 +	+ commit 795965437732e50f6216d7f5db0e6174e90548a9
 +	* 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.
 +	+ commit f6d3c6e5263d84b94ebe13df9ff39b02109a2acb
 +	* 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.
 +	+ commit 6eebc56687935f3e993eac374b9f4cc5ad3bcf2b
 +	* 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.
 +	+ commit 9453d645d4a489f038829c80343c124fff62d635
 +	* 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.
 +	+ commit 6c87d1ce66d8e93e6c0f16c06116e9179f6158ba
 +	* 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.
 +	+ commit 274d7b17a90908a90ba6ad295c08a79b287fc231
 +	* 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.
 +	+ commit 3f6abb57a7b5e54b593c5775c8f7a07d61119705
 +	* 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.
 +	+ commit 09e8f35d3808d6e49f891360c341aae3869e8650
 +	* 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.
 +	+ commit 6f3d11d8837b00e3a1c4fa881066855c0321d6b2
 +	* 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_.
 +	+ commit 11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993
 +	* 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.
 +	+ commit a23c30fb59c0a216763a7972028995d3be42a844
 +	* g10/getkey.c (getkey_ctx_s): Remove last_rc.
 +
 +2015-01-21  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix TLS build problems.
 +	+ commit 091c35ec726a4fa4691c2665b13adee6a34b5b66
 +	* dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
 +
 +	gpg: Support --passphrase with --quick-gen-key.
 +	+ commit 4d7c9b0e9aceedd924d600978bc1b6cae7d5c456
 +	* 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.
 +	+ commit aa99ebde778b7b563f35025f1b48954757f840be
 +	* 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.
 +	+ commit 7be1b7d8017cb7ebf1a3855edec0ef5e342cc9c5
 +	* 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.
 +	+ commit c5956592c171e6fe988e74161aa99636b7f12e4b
 +	* 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.
 +	+ commit 16a1330fa16f6b23e2661c0175c431ab40da45ff
 +	* 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.
 +	+ commit 657a26f3af1b3f817d6cde2d091273d332571247
 +	* 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.
 +	+ commit 100b322f5da3066bab5a2b0eb234c631c581c0e4
 +	* 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.
 +	+ commit 22b15fccffe613f455f9748c048c8e451724a842
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
 +
 +	scd: fix merge failure.
 +	+ commit 602f17b5a775f02e0e33a54d3155929dc00e4f53
 +	* 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.
 +	+ commit 9bf40849a9f86204e113712c4cc285f1ac16127a
 +	* sm/misc.c (transform_sigval): Init RSA_S_LEN.
 +	* g13/mount.c (read_keyblob): Init HEADERLEN.
 +
 +	gpg: Remove unused args from a function.
 +	+ commit 616e511f278bf9af04dc66bbb8b05b37bf541f37
 +	* g10/keyserver.c (parse_keyserver_uri): Remove args configname and
 +	configlineno.  Change all callers.
 +
 +	gpg: Clear a possible rest of the KDF secret buffer.
 +	+ commit 56e688823345bbcfef220b13eb418854f8798b16
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
 +
 +	build: Require automake 1.14.
 +	+ commit 445bb17d5fe6b53db078082fb033dbc67eea8307
 +	* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
 +
 +2015-01-04  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Make --allow-loopback-pinentry gpgconf changeable.
 +	+ commit ac2cb47fc5c0be539aaa07fd141acdbc0934800f
 +
 +
 +2014-12-22  Joshua Rogers  <git at internot.info>
 +
 +	tools: Free variable before return.
 +	+ commit cf88337f8a4f8c98aca4b1da5921d18567b4f474
 +	* 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.
 +	+ commit ed8383c618e124cfa708c9ee87563fcdf2f4649c
 +	* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
 +	double-free of pwbuf.
 +
 +	scd: Avoid double-free on error condition in scd.
 +	+ commit b0b3803e8c2959dd67ca96debc54b5c6464f0d41
 +	* scd/command.c (cmd_readkey): avoid double-free of cert
 +
 +	avoid future chance of using uninitialized memory.
 +	+ commit 367b073ab5f439ccf0750461d10c69f36998bd62
 +	* common/iobuf.c: (iobuf_open): initialize len
 +
 +	avoid double-close in unusual dotlock situations.
 +	+ commit 628b111fa679612e23c0d46505b1ecbbf091897d
 +	* common/dotlock.c: (dotlock_create_unix) avoid double-close()
 +	 in unusual situations.
 +
 +	gpgkey2ssh: clean up varargs.
 +	+ commit 351bca9047d748c3c4f7e9a3cdc476af127b1da3
 +	* 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.
 +	+ commit 6056d2467310260ddc0db2fe65b737ace6febcaa
 +	* doc/yat2m.c (write_th): Free NAME.
 +
 +	dirmngr: Fix memory leak.
 +	+ commit 5a556e4e88bcbc926c0922070acaf5f7b25d18fb
 +	* 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.
 +	+ commit 0d5cb55402c44fb5f731ecf85705f845f3091aa7
 +	* dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
 +
 +	dirmngr,gpgsm: Return NULL on fail.
 +	+ commit abd5f6752d693b7f313c19604f0723ecec4d39a6
 +	* 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.
 +	+ commit bdc8efbdd124d836c36cf482216e375421f72891
 +	* 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.
 +	+ commit 76140141699b545f7a988bf5fc101063917e8ce3
 +	* agent/gpg-agent.c (finalize_rereadable_options): New.
 +	(main, reread_configuration): Call it.
 +
 +	agent: Keep the session environment for restricted connections.
 +	+ commit 14601eacb51f6c8a60d3d57aee1be11debd94c68
 +	* 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.
 +	+ commit aad8963f7b9d13b319abd413db8f42ec467db913
 +	* 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.
 +	+ commit abec64f3cb04e49ca48cc476a5830a920e2ebf8f
 +	* configure.ac (build-agent): Set to yes.
 +
 +2014-12-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Exit with failure if --launch fails.
 +	+ commit 5cb6df8996623c00eaa2a39e3037101585442f7e
 +	* 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.
 +	+ commit 08c00cd4fe432d6852ad1d5c34a234c56aa3617c
 +
 +
 +	po: Update the German translation.
 +	+ commit 4ba740bd4734c43e7876f6f6380cc5963789d510
 +
 +
 +2014-12-16  Petr Pisar  <petr.pisar at atlas.cz>
 +
 +	po: Update Czech translation.
 +	+ commit 30560491fe42562f4bbdb17d3213f7210f549a0f
 +
 +
 +2014-12-16  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Show private DO information in the card status.
 +	+ commit ce9212924039fba4e479760bba86c61b0d91c469
 +	* 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.
 +	+ commit 5ab5b3fa6921f08dd0a498fe0381735e803d01e3
 +
 +
 +2014-12-16  Jedi  <jedi at jedi.org>
 +
 +	po: Update zh_TW translation.
 +	+ commit 668dc6b32cb97608ef65b85d917c86f5aec896ce
 +
 +
 +2014-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add sub-command "factory-reset" to --card-edit.
 +	+ commit dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc
 +	* 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.
 +	+ commit fc9a35d2dec2f838abac831fd88dca494773e082
 +	* 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.
 +	+ commit b4e402cb5c6d7fc507e8d5131969145b49640e50
 +	* 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.
 +	+ commit 68b4e7c9e4de0dc3580ca5af3cfd0f20a2691b5e
 +	* 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).
 +	+ commit f3f9f9b2844c35f7942ee904d5222523615cdad4
 +	* 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.
 +	+ commit 193815030d20716d9a97850013ac3cc8749022c9
 +	* 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.
 +	+ commit 1d8ebe4d54eef37da65e7bd5d7386bc04f344447
 +	* 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.
 +	+ commit e8c0ed779579293b3f4592d9337bc15ee0fc3fdd
 +	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
 +	also for 2 other error messages.
 +
 +	http: Improve diagnostic messages.
 +	+ commit 6d5f12834124ba5ee0e54261531abf95c36c116c
 +	* common/http.c (send_request): Print TLS alert info
 +	(connect_server): Detect bogus DNS entry.
 +
 +	gpg: Obsolete some keyserver helper options.
 +	+ commit 5bf93f4ea7a11381dd256b5fd4e5913366828265
 +	* 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.
 +	+ commit b72ece6d74d3e385e818ead748eba0cb111b95b3
 +	* 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.
 +	+ commit 66ab8f807c96b778f2a2c82b58d3e15ac295e1b2
 +	* g10/keyserver.c (keyserver_put): Write an status error.
 +
 +2014-12-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for EdDSA.
 +	+ commit c50c11d5751f46ddb38244a5a07d8274e1e10922
 +	* 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.
 +	+ commit f4ed04fca8885301b567ec004ffff0d6e24f4611
 +	    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.
 +	+ commit 8720125f5a283ede34e52c2493b8a9b0226ae62c
 +	* 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.
 +	+ commit 63e7891f0f9f0228d93c6cd979fbf2797da2b67d
 +	* 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.
 +	+ commit 17b4662984b4669d8dcbbd6705ccfbe6c263319c
 +	* 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.
 +	+ commit fabcf1440a6900b9471f11e4f2a015e9f2d1a74c
 +	* 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.
 +	+ commit 0367a4b8cfbf1f197e093ca2b83b27e0a409c3c7
 +	* 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.
 +	+ commit f1c3eb4b16ca43b5d3712a3b54c22d17ce85af47
 +	* g10/export.c (do_export_stream): Disable caching.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +
 +	scd: Implement socket redirection.
 +	+ commit 2f90b7c21b2f84ca2bf5f4555da9233e84606b4e
 +	* 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.
 +	+ commit eede0e59bf6281777da7391752ae4191f3e51204
 +	* 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.
 +	+ commit e1f515b19c7f63b6d0b0253319b9fc41dabed657
 +	* 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.
 +	+ commit e59b1cc7471dd161a627b290c645ef7bd0d9d42c
 +	* g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
 +
 +	Add option --no-autostart.
 +	+ commit 7aee3579be6e24a1aa280e75615fc3a11ceef960
 +	* 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.
 +	+ commit f173cdcdfbfd083b035516a406c2c754f38a0ace
 +	* 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.
 +	+ commit ccee34736b57a42ec4bdcb0d3181bdc6a08b0fff
 +	* agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
 +
 +2014-11-26  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	dirmngr: Only report hkps scheme when available.
 +	+ commit 68a7ccc0c870cce6ab9fefb1aa6fd100e1de129b
 +	* 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.
 +	+ commit 1c2140346d6ef9c35e303099d2d15be57869b4d5
 +	* 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.
 +	+ commit 8445ef24fc31e1fe0291e17f90f9f06b536e34da
 +	* 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.
 +	+ commit 596ae9f5433ca3b0e01f7acbe06fd2e424c42ae8
 +	* g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
 +	sanitized.
 +
 +	gpg: Fix off-by-one read in the attribute subpacket parser.
 +	+ commit 0988764397f99db4efef1eabcdb8072d6159af76
 +	* 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.
 +	+ commit b716e6a69919b89c7887d6c7c9b97e58d18fdf95
 +	* 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}
 +	+ commit eed16ccebf8fd1fdf9709affbd5c831f6957b8ae
 +	* common/argparse.c (initialize): Use correct value.
 +
 +	gpg: Refer to --throw-keyids instead of --throw-keyid.
 +	+ commit a3cf781e3bc144aff60e007b9ba59bff7b1b2c9e
 +	* g10/encrypt.c: adjust error message
 +
 +2014-11-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Track number of skipped v3 keys on import.
 +	+ commit 44c9cc18968b3e1d7568ec41ebf28a07285c61bb
 +	* 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.
 +	+ commit 94a54425144e412bc83e44b7c6323282f49f650f
 +	* 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.
 +	+ commit 9a85b91e925ac0798d56820353bf5858b212277f
 +	* 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.
 +	+ commit f80c2dd78d522f12b2c7afbd5c0763a97d87d2bd
 +	* g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
 +
 +	Fix linker problem on OS X.
 +	+ commit cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0
 +	* 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.
 +	+ commit 164a6a9dd4af26668dd0d01061688bf1ceff44bf
 +
 +
 +	Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
 +	+ commit 0e7dd40342bd56810c27db1c38c1928f56f43bfd
 +	* 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.
 +	+ commit 329ece46bf83871f01eb833d5ebec6da36bfcce0
 +	* po/LINGUAS: Add new translations.
 +
 +2014-11-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a NULL-deref for invalid input data.
 +	+ commit 32e85668b82f6fbcb824eea9548970804fb41d9e
 +	* 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.
 +	+ commit 69384568f66a48eff3968bb1714aa13925580e9f
 +	* 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.
 +	+ commit 22748338da9a78d20aefe3656ba40b0f9d34a681
 +	* g10/kbnode.c (dump_kbnode): Print a LF.
 +
 +	gpg: Remove PGP-2 related cruft.
 +	+ commit e30cb8f61792e3808f7c8f343fc8545e6c81fe74
 +	* 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.
 +	+ commit 81e177be10273885573f5d1fd88a1ee23479f4ab
 +	* g10/keylist.c (list_keyblock): Flush stdout for secret keys.
 +
 +	gpg: Fix regression in --refresh-keys.
 +	+ commit eecbed004ca1e9ca23c3892c3a5e6dd174ddf93b
 +	* 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".
 +	+ commit ffc2307843ce6c4ac3c8d99ba8c70ffa1ae28e39
 +	* 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)
 +	+ commit b8cdfac353ad96d4ef025c066c16dbde34805661
 +	* 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)
 +	+ commit 1adf719b2d8e2d5b912bf6655731e7e586402654
 +	* 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.
 +	+ commit 7362c8c6e60939588e817384ae2e29195cb3f518
 +	* kbx/keybox-search.c (keybox_search): Silently ignore.
 +	* doc/specify-user-id.texi: Docuement '@", '+', and '.' search
 +	prefixes.
 +
 +	w32: Fix http access module.
 +	+ commit f0f5cb6b3e525f696b8820c517190e1d84f3b885
 +	* 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.
 +	+ commit c7c79e31937e2d2fdb4042641786c229e31fbfae
 +	* 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.
 +	+ commit f7e1be24c8fcf588d4e48aa53a85b22bd035e3b0
 +	* 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.
 +	+ commit 8ec0b384a86bd7f67a60ab43ff1540e80c3f729d
 +	* build-aux/speedo.mk (BUILD_DATESTR): New.
 +	(dist-source, installer): Use it.
 +
 +	Release 2.1.0.
 +	+ commit e22b459b910762f77245283746de34c67ebc72da
 +
 +
 +	Avoid sign extension when shifting the MSB.
 +	+ commit 91b826a38880fd8a989318585eb502582636ddd8
 +	* 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.
 +	+ commit 46fa1e0fe9f7407f12aa854e5cdb54624af3e89b
 +	* 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.
 +	+ commit f8c993fbe28bf02f1d7aadec823a9dfc935398fa
 +	* 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.
 +	+ commit d95f05c314adfecbe0af9073f964030010442f9b
 +	* g10/getkey.c (getkey_next): Disable cache.
 +
 +	gpg: Minor cleanup for key listing related code.
 +	+ commit 440e8f517008107a9fe1b72cb659b97b7d840de6
 +	* 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.
 +	+ commit a929f36693567e57eca89fb48f23cada8ce7291a
 +	* 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.
 +	+ commit f4df71aa2d544ec46a2ded3055ffb21b9842129e
 +	* g10/gpg.c (main): Remove check.
 +
 +	kbx: Let keydb_search skip unwanted blobs.
 +	+ commit 935edf88ab29b2f63afc2a0e3af1b33c92033ab7
 +	* 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.
 +	+ commit 28ae8ad70b3b802e67344468a4765eee6e291c68
 +	* 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.
 +	+ commit 433208a5536608c2b40525eebadbbdeb7780d7f2
 +	* g10/getkey.c (have_secret_key_with_kid): Do not change the search
 +	mode.
 +
 +	build: Avoid distributing backup files etc.
 +	+ commit b47fe2b14e2a610706bdeff9dbd9a5f7bd6f6b3a
 +	* 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.
 +	+ commit 9546aa3cc87fc83a40768a12fbbceb19496ce129
 +	* 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.
 +	+ commit 0d73a242cb53522669cf712b5ece7d1ed05d003a
 +	* 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.
 +	+ commit f5592fcff308007322a201c970a6d5e8763c9fe3
 +	* gl/stdint_.h [__APPLE__]: Include hack.
 +
 +2014-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fixes for native build.
 +	+ commit 158fe900183daf745821dea7a70cf1c673cd8de0
 +	* 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.
 +	+ commit c9aadcb3a248632c07391ff3d829bece9320a901
 +	* 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.
 +	+ commit 472a4a0d82add2d17154fa38e0074eaea56c28c1
 +	* g10/parse-packet.c (parse_key): Print warning only in very verbose
 +	mode.
 +
 +	gpg: Make card key generation work again.
 +	+ commit 1b8decc4767f0c55867327bdf3113204efcd19a7
 +	* 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.
 +	+ commit 6d9491842d5da597980eaa59e1e3e2137965fe09
 +	* 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.
 +	+ commit a13705f4c18db56765f4af31376e81241dbabebe
 +	* autogen.sh <build-w32>: Set SYSROOT.
 +
 +	gpg: Remove all support for v3 keys and always create v4-signatures.
 +	+ commit 8fd150b05b744fe9465057c12529d5e6b6b02785
 +	* 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.
 +	+ commit fab89f159bcb36ea7285af661d5756eefa981822
 +	* 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.
 +	+ commit 21c0ea6bafafbcc4a2e07f0ac76275cc0229e9a0
 +	* 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.
 +	+ commit c60814a5ce13932d933b363abc0c60c12783ae2f
 +	* 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.
 +	+ commit 2543f0ab9c7b4247347688863f898667bae31984
 +	* 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.
 +	+ commit 2d68dc437e7de92619abe3a019b0a7606487b6bf
 +	* 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.
 +	+ commit 5b5e5a6027ae1743719e112aa4e9055f1b8133a7
 +	* 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.
 +	+ commit 6cabb7a2a18f871b8c3d5de58bcdc5aaa5b201af
 +	* 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.
 +	+ commit 2ca90f78cee91c43b8d538d1cb92728f8e1452d5
 +	* 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.
 +	+ commit 60e21d8b85888b8c9ea15c70268f98d780fdf5fb
 +	* 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.
 +	+ commit b6507bb80e4e4aa5c85a918fdcf5c28cccb75081
 +	* 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.
 +	+ commit ec332d58efc50f6508b87fc9f51db68c39cee044
 +	* 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.
 +	+ commit 27fe067efea883629354450a042ad09e47d90ff8
 +	* 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.
 +	+ commit 3ae6afc1336d42bd95fa0b7f5f83bd299ae26b97
 +	* 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.
 +	+ commit 0943c7cc23371943e9670a2f35c318d847cbac6a
 +
 +
 +	gpg: Allow creating a cert-only primary key.
 +	+ commit bc8583f247898a1fa45f6de834d34b335ab1952c
 +	* g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
 +
 +	build: Add configure options --disable-{ntb,gnu}tls.
 +	+ commit 6522a68d8d11e15ee77102e6830f251c2d9f440d
 +	* 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.
 +	+ commit a6fcdbc9e0fc0e45a3badc23813e689e83059b61
 +	* 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.
 +	+ commit b15d5d42adf31c0797797ebe19c471ab6f52c668
 +
 +
 +	Remove support for the GPG_AGENT_INFO envvar.
 +	+ commit 9c380384dafb213334f8834178c5ceb0bf33db6e
 +	* 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.
 +	+ commit 688a903b4b3ad348c0d09e9d3fab8a12f4f94311
 +	* g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
 +
 +	First changes for future use of NTBTLS.
 +	+ commit f2361e6d582d4343d71d294ed1da654afe7750ee
 +	* 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.
 +	+ commit 6bc0cd6202033be113999dbf27be4014bdf2c784
 +	* 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.
 +	+ commit edd191e5b006dc6ace1d41672e7201cbe58c41c9
 +	* 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.
 +	+ commit d33246700578cddd1cb8ed8164cfbba50aba4ef3
 +	* 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.
 +	+ commit f3625bb018fa8d5bc754f982996f8788386f0a9d
 +	* 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.
 +	+ commit 7ff4ea2160e87a16bf701552d3b9c7ab1c42f9ec
 +	* 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.
 +	+ commit 20c6da50d4f6264d26d113d7de606971f719a0ca
 +	* 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.
 +	+ commit 371c2b14b0347209efd23b4e54e1981a12d7aeab
 +	* 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.
 +	+ commit 59b6f6f16e095162358ac2001aeb2c058de2fd1e
 +	* build-aux/getswdb.sh: Check for required tools.
 +
 +	speedo: Autodetect sha1sum tools.
 +	+ commit 2427bc5bc76b00cfe790e1f370113f5b4199e8fa
 +	* 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.
 +	+ commit bc2f5c1d1afbe8ba413e594639fd05f19df32f75
 +	* 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.
 +	+ commit 1d33d03f0bb576601f5eef1a548cbc519f251b17
 +	* g10/delkey.c (do_delete_key): Check availibility of a secret key.
 +
 +	gpg: Make algorithm selection prompt for ECC more clear.
 +	+ commit cf648fc5c8cb20bfea4fd303631ba311bbaf3659
 +	* 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.
 +	+ commit 93f158df381af86036332c4314c2d4a64eab3e62
 +
 +
 +	speedo: Distribute needed files.
 +	+ commit 72a16d80d4505aa0ff509aae41f848bbe42ed129
 +	* Makefile.am (EXTRA_DIST): Add speedo stuff.
 +
 +	build: Enable gpgtar by default.
 +	+ commit 345a8374f31e637a99e6438e527670cf6845ca05
 +
 +
 +	common: Do not build maintainer modules in non-maintainer mode.
 +	+ commit 927db789c19cbe5656ff980841ee37dd3a8989e7
 +	* common/Makefile.am (module_maint_tests): Use only in maintainer
 +	mode.
 +	(t_common_cflags): New.
 +
 +	common: Remove superfluous statements.
 +	+ commit cad181b5ece3ab6910575c82c731ce2b47271a09
 +	* 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.
 +	+ commit 6e7bcabd781a3ca9ad7dd90d962fb2a239feab4a
 +	* 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.
 +	+ commit b17e8bbf20239e840763f98d3e62f16efdc82ba3
 +	* 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.
 +	+ commit f82a6e0f08725008c5bbf702a5f4c175ea09f01c
 +	* agent/pksign.c (do_encode_md): Init HASH on error.
 +
 +	agent: Remove left over debug output.
 +	+ commit 4f35ef499ac913036b7b69296a62afe8159b90b8
 +	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
 +	output.
 +
 +	agent: Silence compiler warning for a debug message.
 +	+ commit ba6f8b3d9ec83b35c4f3839853567491fee2f99c
 +	* agent/call-pinentry.c (agent_query_dump_state): Use %p for
 +	POPUP_TID.
 +
 +	sm: Silence compiler warnings.
 +	+ commit 34b2e8c7dcb0edb28f99edbd788d73491334e3c0
 +	* 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.
 +	+ commit 6a0c3fa19cfcdd590b96691e8a8ffb48fb5e0ec4
 +	* g10/parse-packet.c (enum_sig_subpkt): Replace hack.
 +
 +	gpg: Replace a hash algo test function.
 +	+ commit 327134934d79d141d92170ad3b4a6ef3cb718ee0
 +	* g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
 +
 +	speedo: Various fixes.
 +	+ commit 2f065d7ab6c514013eb8504281f50284764c26ec
 +	* 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.
 +	+ commit ae3d1bbb65b65cf3c57bb14886be120f5e31635d
 +	* g10/keyedit.c (subkey_expire_warning): New.
 +	(keyedit_menu): Call it when needed.
 +
 +	gpg: Improve passphrase caching.
 +	+ commit 457bce5cd39146df047e4740162125c32c738789
 +	* 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.
 +	+ commit 83c2d2396cc9fa6bdd887a560830fc0f48b01b08
 +	* 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.
 +	+ commit 3d250d21d36e8a0935b645f1ed5134ef9083530e
 +	* 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.
 +	+ commit 84419f42da0fd436a9e0e669730157e74ce38b77
 +	* 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.
 +	+ commit 3b20cc21de86ac8a475bdefd3aebb02a12fb8d0b
 +	* 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.
 +	+ commit 98f65291d7abecc1e4d618125f33b6ce759e0892
 +	* 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.
 +	+ commit bf2fc12b83b45953f7afa403b8d91c36d0b50ec9
 +	* 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.
 +	+ commit afe85582ddc2ebc285728bf6417f8929fd0b3281
 +	* 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.
 +	+ commit 4054d86abcb7ad953ed9e988b1765cb9266faefd
 +	* 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.
 +	+ commit c913e09ebdbb1a1e9838a0a5897448841f5e9bc3
 +	* 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.
 +	+ commit be98b5960ebd48929c399b0b91c95bfc0cb9749b
 +	* 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.
 +	+ commit 40ad42dbe3c67d8103aedb6b584f4bedc5f93307
 +	* 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.
 +	+ commit 15cfd9a3bcdd561091a28c8f989c616b87348463
 +	* g10/keygen.c (keygen_set_std_prefs): Update prefs.
 +
 +	Switch to the libgpg-error provided estream.
 +	+ commit 519305feb888b529c005b40445d041a088a2f8fc
 +	* 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.
 +	+ commit a731c22952278c12c601b73d7581fda3a15a4b5b
 +	* 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.
 +	+ commit cb680c5ea540738692a5c74951802b0fdc658e85
 +	* 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.
 +	+ commit 31649e72fd106a990614ce3cf720640a841ba722
 +	* build-aux/getswdb.sh: New.
 +	* build-aux/speedo.mk: Get release version numbers from swdb.lst.
 +
 +	build: Create VERSION file via autoconf.
 +	+ commit 4fc1c712e986f280057b1bce7ca4696ba6d95dfc
 +	* 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.
 +	+ commit e5da80bc1888bf8801e69c9ff99f7f47550f7a09
 +	* g10/distsigkey.gpg: New.
 +
 +	agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
 +	+ commit 3981ff15f3c0829ba22cd37794353502d996683c
 +	* 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.
 +	+ commit e4aa006e4807285ffdd881e4e05af3bc47c5c964
 +	* kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
 +
 +	gpg: Change default cipher for --symmetric from CAST5 to AES-128.
 +	+ commit 57df1121c18b004dd763b35eabf7b51fc9e8ec38
 +	* 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.
 +	+ commit 425d0750168f6b66a5d78a857cf21375a8f129eb
 +	* 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.
 +	+ commit 7e51ef0f77962f5fb215da53817caf28899ca190
 +
 +
 +2014-08-17  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Change license from GPL to LPGL.
 +	+ commit af1196512f505e8a3a338f9b72394fa3585a5234
 +	* 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.
 +	+ commit a13198d9bcee368a8de7a401feb017efc83ff795
 +
 +
 +	po: Update the German (de) translation.
 +	+ commit fe9ff33b9dc8793957998341cf4bcf5e50827b41
 +
 +
 +	sm: Create homedir and lock empty keybox creation.
 +	+ commit c4b60cdae8dbf68206fd105fd09adeb61a9dafe4
 +	* 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.
 +	+ commit c23c18c1543d1ff58f0f78baaa6a8e319c659ecb
 +	* 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.
 +	+ commit a61b28df1f29b1e306115282ec1ce580fa54945a
 +	* 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.
 +	+ commit ae29b52119aa419989b773b2d6abb6e287dfc81b
 +	* 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.
 +	+ commit 2b8d8369d59249b89526c18c5ac276e6445dc35e
 +	* 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.
 +	+ commit 49c9a958e0b786850309bca555d4465c97d337e1
 +	* autogen.sh <find-version>: Fix.
 +
 +	gpg: Remove --compress-keys and --compress-sigs feature.
 +	+ commit 71b55e91f02cdb65a8884892f71c4c7bf8a75247
 +	* 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".
 +	+ commit 7d0492075ea638607309b3ea6a792b0e95ea7d98
 +	* 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.
 +	+ commit a57c33c855c6757c8770529ee71f0f90744cd7a6
 +	* 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.
 +	+ commit 2d9f76e07082fc231303ac2c6ae1aea3c98fa2e4
 +
 +
 +2014-07-25  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Minor and editorial changes to app-sc-hsm.c.
 +	+ commit 2e936915cf2f830e60d974d607b08822645f5753
 +	* 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.
 +	+ commit e49c851ff54d5ecf856411bf6cdee721695ea172
 +	* 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.
 +	+ commit 8eb9224f32ddf1c9e1490c4d9688a177f8b6ae64
 +	* 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.
 +	+ commit 557cc11a605dd280d03c52d8b546deed8c4c714d
 +	* 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.
 +	+ commit b3378b3a56fc90ba8ae38e6298b23a378305af32
 +	* agent/genkey.c (check_passphrase_constraints): Build a final warning
 +	after all checks.
 +
 +	agent: Only one confirmation prompt for an empty passphrase.
 +	+ commit a24510d53bb23e3a680ed2c306e576268c07060d
 +	* agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
 +	check to the front.
 +
 +	gpg: Add command --quick-gen-key.
 +	+ commit ea186540db5b418bc6f6e5ca90337672c9981c88
 +	* 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()
 +	+ commit 75127bc4561787aa9bc1cf976658e20192446d7f
 +	* 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.
 +	+ commit 17404b2fccbc74c4f0b2364cc08e9dcc64175cf8
 +	* 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.
 +	+ commit bc6b452129178658da7241903ca2174c79281752
 +	* 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.
 +	+ commit 5b34e347b612765f31061d077b7c343e08662ba9
 +	* g10/parse-packet.c: Add list_mode output for certain failures.
 +
 +	gpg: Cap size of attribute packets at 16MB.
 +	+ commit bab9cdd971f35ff47e153c00034c95e7ffeaa09a
 +	* 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.
 +	+ commit 5ae34f574baca2b98a09fd982c941855558408e1
 +
 +
 +	gpg: Make show-uid-validity the default.
 +	+ commit 5214d8f02bf65fb0a4af15ff80cf1369ccd4c167
 +
 +
 +	tests: Fix end-of-all-ticks test for Western locales.
 +	+ commit 3533860ee316918dd47501c53e910bfd0032b39d
 +	* 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.
 +	+ commit b51af333bdf77c042c9fe748616e80d1f5e4d3f9
 +
 +
 +2014-06-30  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Auto-create revocation certificates.
 +	+ commit 03018ef9eec75e4d91ea53c95547a77dedef8f80
 +	* 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.
 +	+ commit aa5b4392aac99382d96be94782ae745e0a42484a
 +	* common/estream-printf.c (pr_string): Take care of non-nul terminated
 +	strings.
 +
 +	gpg: Rearrange code in gen_revoke.
 +	+ commit 3a01b220715b3d1a90d94353e4980ab5a1ea8f26
 +	* g10/revoke.c (gen_revoke): Factor some code out to ...
 +	(create_revocation): new.
 +
 +	gpg: Create exported secret files and revocs with mode 700.
 +	+ commit c434de4d83ccfaca8bde51de5c2ac8d9656e4e18
 +	* 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.
 +	+ commit 35fdfaa0b94342c53eb82eea155a37ad4009fa9f
 +	* common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fix the w32 installer name.
 +	+ commit adad1872b448593275d8cae06dffe376bee067b5
 +
 +
 +	po: Update some strings of the French (fr) translation.
 +	+ commit 1ef7870fc96f6dd8137e9bfabf9b06787f75dffd
 +
 +
 +	po: Update the German (de) translation.
 +	+ commit c2e3eb98884785e6794dc79c1a53d75945f4c1ab
 +
 +
 +	agent: Adjust for changed npth_eselect under W32.
 +	+ commit a1dff86da8ebaab6e154360f538ca9d43a6c4934
 +	* 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.
 +	+ commit 5e1f9b5e1427688ac340f0829e02bece7f0caf9c
 +	* 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.
 +	+ commit 2c4025576105a9deb78e1cfb22c11af4af09c4fa
 +
 +
 +	Fix typos in messages.
 +	+ commit e56a2d6a56d95c0f169506a8dc74a845c22b699d
 +
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	build: Remove unused options.
 +	+ commit 2540a4b674a17b45ec33f43f26e830e74ff0afed
 +	* 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.
 +	+ commit 73ba75ad8b933beddd2c3f4b66937b56faa0a2d8
 +	* 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.
 +	+ commit 24be0f24d3a9325a04de10ae0e5e277bf28a74fe
 +	* 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.
 +	+ commit 03f0b51fe454f8dbe77c302897f7a5899c4c5380
 +	* 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.
 +	+ commit c0d1e7fca95629e1cddd7d129fa51b9a6556cb70
 +	* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
 +	(use_dns_srv): Make test work.
 +
 +	agent: Fix export of RSA keys to OpenPGP.
 +	+ commit 9a034acf8ab6f85c65ccc75a4fd7b8dd47b73e3a
 +	* agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
 +	string.
 +
 +	gpg,gpgsm: Simplify wrong_args function.
 +	+ commit 572502bd2c0637429bca547ba882629640477495
 +
 +
 +	speedo: "make clean-gnupg" may not remove the source.
 +	+ commit c029a184d6a1a96c6de234835fff97d4e946b19c
 +	* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
 +
 +	gpgsm: Fix default config name.
 +	+ commit 2480b0253166712a2f20b92f34c8e4c2db0fc26f
 +
 +
 +2014-06-25  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Improve the rendering of the manual.
 +	+ commit b5f95c1b566f9530127f3f34e10d120a951cf428
 +
 +
 +	doc: Update for modern makeinfo.
 +	+ commit f149e05427a370f5985bc3fb142370b043f19924
 +	* doc/texi.css: Remove.
 +	* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
 +
 +	gpg: Allow key-to-card upload for cert-only keys.
 +	+ commit f171fd226e84311f92545ca0494771db07ba777d
 +	* 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.
 +	+ commit 2c8e00137a340d04f0836f75e138dd85f8c9eff7
 +
 +
 +2014-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make export of ECC keys work again.
 +	+ commit f4fcaa29367daacfe0ca209fa83dfa8640ace276
 +	* 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.
 +	+ commit d6ca407a27877174c10adfae9dc601bea996cf27
 +	* 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.
 +	+ commit 3f17b74aa57ac1ea2f3aa93dec4889778a21afeb
 +
 +
 +2014-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Support building from dist-source generated tarball.
 +	+ commit 47e63dc00169030b6ff01ab67e73e52aec1395db
 +
 +
 +2014-06-13  Werner Koch  <wk at gnupg.org>
 +
 +	http: Print human readable GNUTLS status.
 +	+ commit 5bf04522e353675e4c3eda118fee2580756704a2
 +	* 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.
 +	+ commit d8314e31c58ea0827d0e2361dabcdf869ab08fce
 +	* 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.
 +	+ commit 6eeb31abee82cb2016bf054cd302af64f6dfdc2e
 +	* 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.
 +	+ commit e06d5d1a3b4a5c446a27d64cd2da0e48ccec5601
 +	* build-aux/speedo/: New.
 +	* build-aux/speedo/w32/: New.
 +
 +	build: Add more options to autogen.sh.
 +	+ commit 0399d87f7aaf2f2126a63899004c5c7bffd4346b
 +	* autogen.sh: Add options --print-host and --print-build.
 +
 +	w32: Fix build problem with dirmngr.
 +	+ commit 141d69cb2a94a752244e89f49611923a2f184dfd
 +	* dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
 +	constant.
 +
 +	gpg: Use more specific reason codes for INV_RECP.
 +	+ commit 45ed901c466bd72118c2844069f566e190d847d6
 +	* 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.
 +	+ commit b67e4e523e6d19d384e23c5bb03010caebd150e7
 +	* 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.
 +	+ commit 23712e69d3f97df9d789325f1a2f2f61e7d5bbb4
 +	* 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.
 +	+ commit 9c9e26d41e7d65711da8dbf1afa452254749621c
 +	* g10/keygen.c (ask_curve): Add arg both.  Require confirmation for
 +	Curve25519.
 +
 +	gpg: Auto-migrate existing secring.gpg.
 +	+ commit 4f0625889b768eabdec52696bf15059a9e8d9c02
 +	* 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.
 +	+ commit 09a2d4ec74d352dcb4f006aab60b07bc4f5f1a37
 +	* sm/server.c (option_handler): Use "with-secret".
 +
 +2014-06-03  Werner Koch  <wk at gnupg.org>
 +
 +	Add new option --with-secret.
 +	+ commit be07ed65e169a7ec3fbecdb1abf988fc0245d9ff
 +	* 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}
 +	+ commit 0beec2f0f255a71f9d5a4a0729d0259f673e8838
 +	* 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.
 +	+ commit 958e5f292fa3f8e127f54bc088c56780c564dcae
 +	* g10/keyid.c (hash_public_key): Take care of NULL keys.
 +	* g10/misc.c (pubkey_nbits): Ditto.
 +
 +	gpg: Simplify default key listing.
 +	+ commit f3249b1c4d0f2e9e0e8956042677e47fc9c6f6c0
 +	* g10/mainproc.c (list_node): Rework.
 +
 +	gpg: Graceful skip reading of corrupt MPIs.
 +	+ commit d9cde7ba7d4556b216f062d0cf92d60cbb204b00
 +	* g10/parse-packet.c (mpi_read): Change error message on overflow.
 +
 +	gpgsm: Handle re-issued CA certificates in a better way.
 +	+ commit 715285bcbc12c024dbd9b633805189c09173e317
 +	* 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.
 +	+ commit 42c043a8ad542c131917879c9b458f234b4bb645
 +	* 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.
 +	+ commit 99972bd6e9abea71f270284f49997de5f00208af
 +	* 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.
 +	+ commit 9e1c99f8009f056c39a7465b91912c136b248e8f
 +	* dirmngr/ks-engine-hkp.c (cert_log_cb): New.
 +	(send_request): Set callback.
 +
 +	http: Add callback to help logging of server certificates.
 +	+ commit 45f15b2d767d4068f79fd5b123e9eeae08a0616d
 +	* 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.
 +	+ commit d2d9d4fb60e3f2160af6252335364d3aac4b7d17
 +	* 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.
 +	+ commit 8b90d79818355b81ce223e1cb96cd0c939096fe2
 +	* 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.
 +	+ commit 25036ec6abbc0c9d0003dcfe227724038c35a304
 +	* 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.
 +	+ commit 71fa6a35107d4d4547eb9155d7c2612b6a6a16fb
 +	* common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
 +
 +	gpg: Remove useless diagnostic in MDC verification.
 +	+ commit 455a4a2212302c05095e736b127f647e95714fe7
 +	* 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.
 +	+ commit b2945c451d3d3f25ba11a9fe88c6cbf3f88c2fb5
 +	* 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.
 +	+ commit 4aeb02562c9db4b96366220b781e2b4fa2d6fd3b
 +	* 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.
 +	+ commit cb2aeb4e1157fc0d7dc25d94115973422dc1a800
 +	* 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.
 +	+ commit fb24808db9af9dfe36f9f6d7fc24e0b903ecc12c
 +	* 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.
 +	+ commit 57011da53e43f9c8a6c7e7314166c3e17ff8627a
 +	* 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.
 +	+ commit 359c643d747c890f73f68b42e0aeb896016f05fd
 +	* g10/mainproc.c (check_sig_and_print): Print the name and curve.
 +
 +	gpg: Fix memleak in signature verification of bogus keys.
 +	+ commit e73edfb1759d05121ea66f67c775e763bf47d737
 +	* 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.
 +	+ commit 09055aa0f7993aaf4dcffdd80d8192945ae6080a
 +	* 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.
 +	+ commit 8fee6c1ce6d116fe7909dbe1184d95bc91305484
 +	* 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.
 +	+ commit bdb9c2b314400da9155b8a924e22e486793dda89
 +	* kbx/keybox-openpgp.c (parse_key): Use algo constants and add
 +	experimental support for EdDSA.
 +
 +	agent: Remove greeting message.
 +	+ commit a63ed9875830e5b3b4d48b7d97d24c18de36b326
 +	* 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.
 +	+ commit 6477e51919ef97f0f9cc05d10cdc7aa2b89faafe
 +	* 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.
 +	+ commit 60e2fc7d38d8b37d1de944cf230e410c2ce37d5e
 +	* 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.
 +	+ commit ea0f5481f01eacedff264bf08144164aa989ec4d
 +	* 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.
 +	+ commit 0e59195642eb26263b8e0b9200290538631d35cd
 +	* 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.
 +	+ commit 2def230231abd34f6012df284ab468321ffedc10
 +	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
 +	value.
 +
 +	http: Revamp TLS API.
 +	+ commit 8412a5825c225c8ff14de3ffaad2e55e040b2eca
 +	* 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.
 +	+ commit 84289e85c72ae58c321dfdb96816700a6b7f7122
 +	* 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.
 +	+ commit 8416c875a729426eae05ed1ca9f1ebcb933c246a
 +	* 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.
 +	+ commit ecea94461ed40f3f6ef662c2501e1d56ec284022
 +	* src/estream.c (es_fileno_unlocked): Call the unlocked functions.
 +
 +	estream: Add debug code to the lock functions.
 +	+ commit aeb81727c77dfea3bf5d2d689ffbdc897f2938a7
 +	* common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
 +
 +	estream: Replace locking macros by functions.
 +	+ commit 39e91a5f0a666aad2fef7a840b2cd03949bb1be4
 +	* common/estream.c: Replace most macros.
 +
 +2014-04-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	ECC Fixes.
 +	+ commit 21dab64030c95a909767bf6d8f99e8476f9df8a2
 +	* 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.
 +	+ commit fdd938a5bbecb5b70f564ae3afb4e17905404bb2
 +	* 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.
 +	+ commit 71a54313adf7b57b7b27bb9ad07b142a34306260
 +	* common/stringhelp.c (do_make_filename): Add modes 2 and 3.
 +	(make_absfilename): New.
 +	(make_absfilename_try): New.
 +
 +	common: Add function gnupg_getcwd.
 +	+ commit 1a87edab6657a257876ab2f8790f2937feba7066
 +	* 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.
 +	+ commit ffa39be5ebfc1059a737905ee317c9b6f3d2a77e
 +	* 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.
 +	+ commit e184a11f94e2d41cd9266484542631bec23628b5
 +	* g10/photoid.c (show_photos): Set namehash.
 +	* g10/misc.c (pct_expando): Add "%U" expando.
 +
 +	common: Add z-base-32 encoder.
 +	+ commit b8a91ebf46a927801866e99bb5a66ab00651424e
 +	* 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.
 +	+ commit a34afa8f2053d75f276d6d28dbf1a43db0fd9768
 +	* 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.
 +	+ commit db3b528239c9d56bc71fd2283e07a3f1d91e4fd0
 +	* 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.
 +	+ commit d25d00b89efed461d344028d0e2e2be38cc77628
 +	* g10/delkey.c: Re-indent.
 +	(do_delete_key, delete_keys): Change return type top gpg_error_t.
 +
 +	gpg: Fix regression in secret key export.
 +	+ commit c4d983239a3f0a18c77f0a5aeba520a81a1b86e8
 +	* 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".
 +	+ commit e549799db66be30cdd68a3e6cdca9c6a050466d1
 +	* 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.
 +	+ commit e3a4ff89a0b106e678bf9d0a4d47917123071140
 +	* 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.
 +	+ commit 3132bd90dc8db9c7fd19ba201918e95891306dc5
 +	* 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.
 +	+ commit db85feceaf43ebd6d44421bb14fcb60495804ae0
 +	* 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.
 +	+ commit b4cf4686f7349be9558217f20e51157398cd88a0
 +	* tools/gpgconf.c: Add command --launch.
 +	* tools/gpgconf-comp.c (gc_component_launch): New.
 +
 +	scd: Silent compiler warnings about unused variables.
 +	+ commit 36dfc37e438660632d3a2bf5d5526be9005fa8c5
 +	* 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.
 +	+ commit 5ff6d0c25e6d0f422b17809b954e9e87cb137347
 +	* agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
 +
 +	g10: EdDSA support.
 +	+ commit 40c3b0741e593d0658dda0c707c4f32e80648dd1
 +	* 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.
 +	+ commit 513c67b7461a2451247ef2b2fc64e0470a16edf1
 +	* 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.
 +	+ commit b6786cc3ec0bb582323adf94c2ee624bcfbeb466
 +	* 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.
 +	+ commit 4f50ec98ddd57253cae66e2321f0cc98ee189a09
 +	* 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.
 +	+ commit 5c2a50cdc90e85b1fc380851ccfbe9186969b658
 +	* 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.
 +	+ commit fc3e70c11342267c1062e4244955d19ecd72e0f6
 +	* 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.
 +	+ commit 072432883ededa15bf35f80102e0572746ba4af1
 +	* 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.
 +	+ commit a77ed0f266d03e234027dda4de5a7f3dd6787b1e
 +	* 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.
 +	+ commit 6376227a31b3076321ce16ad626b333057bda53d
 +	* tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
 +	strlen.
 +
 +	dirmngr: Resurrect hosts in the HKP hosttable.
 +	+ commit 6c058fac65c7e9d1ffb72686f0f02644f172da22
 +	* 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.
 +	+ commit 04e304278c9302831bc81e7fe9049c588ead029a
 +	* common/gettime.c (elapsed_time_string): New.
 +
 +2014-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Reject signatures made with MD5.
 +	+ commit f90cfe6b66269de0154d810c5cee1fe9a5af475c
 +	* 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.
 +	+ commit 1e2e39c5758ffaf62f8bb85b4a86dc49c41f3a68
 +	* 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.
 +	+ commit 1d642d3ca890daa65ee5dd949a00747da6b49015
 +	* 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.
 +	+ commit 2223eaefaf53aa7217ac593b83e4294148a4db5d
 +	* tools/gpg-connect-agent.c: Add options --dirmngr and
 +	--dirmngr-program.
 +
 +	dirmngr: Make use of IPv4 and IPV6 more explicit.
 +	+ commit 59b4fb5f4927908af06bb80ecd86adbf6e54ba14
 +	* 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.
 +	+ commit d7fbefeb82833db9eea8b15dc7889ecf0b7ffab4
 +	* 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.
 +	+ commit a401f768ca8e218eef7a5c87a8f99cb1d6b4aaeb
 +	* 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.
 +	+ commit 5d321eb00be0774418de1a05678ac0ec44d7193b
 +	* 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.
 +	+ commit 6dd5d99a61f24aff862ccba9f7410d7f1af87c05
 +	* 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.
 +	+ commit fb56a273b1f2b3a99dc1d1a0850378ab7625e6b9
 +	* 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.
 +	+ commit 3d9e0eb02ce2b2e153e25deb0fc4b27b45f5026a
 +	* 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.
 +	+ commit 781b94174310dceffa075719420b74b29fe41764
 +	* 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.
 +	+ commit 0b2cca807d5a4a3664145032271141da853e7bac
 +	* 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.
 +	+ commit a3dee2889106fcab112c1c96b32e04d8154875e7
 +	* 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.
 +	+ commit 71b55c945542e695161ddbd783f87c5f534012a5
 +	* dirmngr/server.c (data_line_cookie_write): Print shorter data lines
 +	in verbose mode.
 +
 +	dirmngr: Fix HKP host selection code.
 +	+ commit 3c35b46a32ac7584f3807b611cde78b199c527d6
 +	* 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.
 +	+ commit f30d8b018871495327cbf711b73b04278a34f3e1
 +	* 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.
 +	+ commit ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1
 +	* 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.
 +	+ commit 57d26f39afb3c75e24a8d240d7af32b9d2b9775a
 +	* 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.
 +	+ commit 9ab9f414fb919f0bc87c301c3e36180715d0aa4e
 +	* 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.
 +	+ commit b278043a8f38e2706ccf617d2ac5661b33791d6b
 +	* 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.
 +	+ commit feda379595e06583bc5b3610dec74890de29cb8e
 +	* dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
 +	(my_ldap_timeval_t): New.
 +
 +	Silence more warnings about unused vars and args.
 +	+ commit 4387ecb11cdb2addf738eb922c1b9f14c6c76efc
 +	* 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.
 +	+ commit 35266076e3452590931e58f188815859dff6de3c
 +	* dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
 +	(ldap_str2charray): Remove lasts.
 +
 +	Use attribute __gnu_printf__ also in estream header files.
 +	+ commit 72133b54de89e593d8193b106e9369cf90d2e1c0
 +	* common/estream-printf.h: Use attribute gnu_printf.
 +	* common/estream.h: Ditto.
 +
 +	Use attribute __gnu_printf__ with our estream-printf functions.
 +	+ commit 36372dcb2f75a659b7ace0e9c46f07bb431d009c
 +	* common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
 +	(JNLIB_GCC_A_NR_PRINTF): Ditto.
 +
 +	w32: Silence warnings about unused vars.
 +	+ commit 094aa2589e3920d400be93ae2823a6c4b23db623
 +	* 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.
 +	+ commit a0fc42598f51ef4a958fc3c2fed7f4b8df2da3fd
 +	* 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.
 +	+ commit 3032fc3ad78ac9ed857570844547afed520d635a
 +	* 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.
 +	+ commit cb0dcc340836a64e2d33b27f1be7bc888c084f12
 +
 +
 +	gl: Avoid warning about shadowing an arg.
 +	+ commit 84fd36f8baa2b800ea47ff74935f5aaf0e55c299
 +	* gl/setenv.c (KNOWN_VALUE): s/value/_v/.
 +
 +	common: Fix build problem with Sun Studio compiler.
 +	+ commit 0fc71f7277c6f833f838bbd384f1a22d0c333e8e
 +	* common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
 +	functions.
 +	(ESTREAM_MUTEX_INITIALIZE): Ditto.
 +
 +	gpg: Do not require a trustdb with --always-trust.
 +	+ commit d8f0b83e4f04641e5e9adbdd8abada15380f981c
 +	* 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.
 +	+ commit dfb25d47a9fcfd7c7c084ea58744724cd5315086
 +	* g10/keyedit.c (keyedit_menu): Print message.
 +
 +	gpg: Protect against rogue keyservers sending secret keys.
 +	+ commit db1f74ba5338f624f146a3cb41a346e46b15c8f9
 +	* 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.
 +	+ commit 90688b29f3701f4d3e2a5a49c5544fe8d2a84b2d
 +	* agent/command-ssh.c (setup_ssh_env): Fix env setting.
 +
 +	gpgv: Init Libgcrypt to avoid syslog warning.
 +	+ commit 7c4bfa599fa69c3a942c8deea83737a4c5a0806e
 +	* g10/gpgv.c (main): Check libgcrypt version and disable secure
 +	memory.
 +
 +	Improve libcurl detection.
 +	+ commit 5ca482d5f949444ffd453de158ee186ab07fc9b6
 +	* 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.
 +	+ commit 0ab752cc2d46bbd0077bed889676169b7aeb1eb6
 +	* g10/options.skel: Update.
 +
 +	(cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
 +
 +	w32: Define WINVER only if needed.
 +	+ commit 76b1940ad6f5f058c4a6bec35902da9f6d4e27b0
 +	* common/sysutils.c (WINVER): Define only if less that 5.0.
 +
 +	w32: Remove unused code.
 +	+ commit 63b7658a29809249d7aeb0423bf8c5a693eee0c7
 +	* jnlib/w32-reg.c (write_w32_registry_string): Remove.
 +
 +	agent: Make --allow-mark-trusted the default.
 +	+ commit 9942a149ff2ab919c1b2916c7bc347e578a56b14
 +	* 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.
 +	+ commit 5105c8d2d344fd7301d456d8c13c7e90a54f7e98
 +	* 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.
 +	+ commit 179012ddd48e63ca83e8f5c24537a2db45c3e122
 +	* 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.
 +	+ commit 4ad123d6fe341da7768e43360375e17fa89e8e0d
 +	* scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
 +
 +	Ignore obsolete option --disable-keypad.
 +	+ commit d2a6be24af0bf220bb448fdd50c0196faddee0f4
 +	* scd/scdaemon.c (opts): Ignore --disable-keypad.
 +
 +	Allow marking options as ignored.
 +	+ commit 8fc9de8d6bf663f7c8419b42dab01f590a694d59
 +	* 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.
 +	+ commit 191e32026f02054b1edb4f02536875462fd0b6b3
 +	* common/membuf.c (get_membuf_shrink): Fix use of LEN.
 +
 +2014-03-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix g10/trust.c.
 +	+ commit 5ed8e9335fb886d7ddc86728d8481e5e47485531
 +	* 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.
 +	+ commit 0f38c87f427a155ab5684e18e3b73956f81edfab
 +	* common/argparse.c (writechar): Remove.
 +	(writestrings): Simplify.
 +	(strusage): Use map_static_macro_string.
 +
 +	common: New function map_static_macro_string.
 +	+ commit c72762f9acf3eef5c466ba76e895d7654df12ff7
 +	* 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.
 +	+ commit 556562086acd2bc2f8e3aa3126ebf155715e042b
 +	* common/membuf.c (get_membuf_shrink): New.
 +
 +	agent: Fixed unresolved symbol under Windows.
 +	+ commit 55c3e5f448c26360eda31e05b1f62249119f73d9
 +	* agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
 +
 +	common: Require an installed libiconv.
 +	+ commit 380a2aa18e0c048cfefa1cb4102dfbf902a1962b
 +	* 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.
 +	+ commit 47e6b6bad1dff493f4102a5549a7bb54466684c2
 +	* 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.
 +	+ commit 672f4aeba8bf55839911e1fe805af6b2873853f7
 +	* common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
 +
 +	gpg: Cleanup compiler warnings due to some configure options.
 +	+ commit 7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4
 +	* 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.
 +	+ commit 62fb86c6589f7f74dad4741db31b3aefa0848420
 +	* 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.
 +	+ commit ea7f895319e89150e5613b6d20f21410f99d6f22
 +	* 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.
 +	+ commit 111f082487dc7a2a50375e24203de31b000e0dea
 +	* configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6.  Avoid some gcc
 +	option tests for gcc >= 4.6
 +
 +	Allow disabling of card support.
 +	+ commit 8e0ba4ecd3897c748ac2f06028406604ae7baced
 +	* 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.
 +	+ commit 357b142e7225e5c7f1e0f9768f48e833d5804b6a
 +	* g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
 +
 +	gpg: Change --print-mds to output enabled OpenPGP algos.
 +	+ commit 54a11729fb71ba06e318fe229d0a230686ed4dc8
 +	* g10/gpg.c (print_mds): Use opengpg_md_test_algo.  Test also for MD5
 +	availibility.
 +
 +	gpg: Avoid compiler warnings for disabled algos.
 +	+ commit aa76a1660613ece3fc0d774856abcbe0bb158300
 +	* 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.
 +	+ commit 2c814806d759e5cf611200e8210137cf8502a672
 +	* 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.
 +	+ commit 2ba818de1aa311ba8eb27012d69e93dd16e7d4ed
 +	* 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.
 +	+ commit 71540d40414dc8b304b45dc476e5e5650a2db20a
 +	* 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.
 +	+ commit bf50604a0d50b974c1d4b8ccf5d774489f996cae
 +	* 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.
 +	+ commit 16a6311adefff0139056714521214f845315b7f8
 +	* 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.
 +	+ commit b7f8dec6325f1c80640f878ed3080bbc194fbc78
 +	* 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.
 +	+ commit ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f
 +	* 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.
 +	+ commit 25b4c2acbd01f9b4c2c364f44c53b73498ed8469
 +	* 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.
 +	+ commit 362a30d8c2f529cd44687066f9c33cab7b43bedc
 +	* 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.
 +	+ commit 0ee66a6f66d7389e381fffa5f9eedbc8de9add10
 +	* 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.
 +	+ commit 9c731bbedfd8bded5efd886304c5ca6655768c45
 +	* agent/findkey.c (agent_is_eddsa_key): Implemented.
 +
 +2014-01-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Add secp256k1.
 +	+ commit c5e41f539b9a21cbad10c7dae95572a4445d31c3
 +	* 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.
 +	+ commit aedfa95bcc49156f2bc6ae5d0f385705d4fbdd32
 +
 +
 +	Turn autogen.sh into a generic script.
 +	+ commit e7973d36d88178b4b0a977e3fcc0d62600777618
 +	* autogen.sh: Revamp.
 +	* autogen.rc: New.
 +	* Makefile.am (EXTRA_DIST): Add autogen.rc.
 +
 +	Rename scripts/ to build-aux/
 +	+ commit 99a48b2fcdf7c33fe553511c12f2ebb8eea5c634
 +	* 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.
 +	+ commit a55ffb9da9a844bd2bd73a4a2ea65bf18b21c57f
 +	* 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.
 +	+ commit 00d5d2204cefb0f4b953e0c00448f16aab2d39c7
 +	* 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.
 +	+ commit fa318406c9bdb60aee1e1b410e4c9e0b3eb1392e
 +	* configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
 +
 +	Fix test for zlib.
 +	+ commit 477aabaf753f987987f7a2e1f999a499ea3bd103
 +	* configure.ac (HAVE_ZLIB): Define only if found.
 +
 +	Add --enable-silent-rules stuff.
 +	+ commit aba53e9f96d0c9b270edef0806976a56326249c4
 +	* configure.ac: Add AM_SILENT_RULES.
 +
 +2014-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Add macro for the registry key.
 +	+ commit 75ba215ebd8be7e14b26bb53ef3c7d41e4ce1e02
 +	* 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.
 +	+ commit 101a54add351ff62793cbfbf3877787c4791f833
 +	* 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.
 +	+ commit 59207a86e5f40c77fed296b642bf76692e8eef65
 +	* 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.
 +	+ commit 159d42ee6ab21d97f40ee129445f37209b875739
 +	* 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.
 +	+ commit e951782e937ce290be0d89d83e84b3daea997587
 +	* 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.
 +	+ commit cc9a0b69b698ba436eaf777e5020532845b56236
 +	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.
 +	+ commit 798daaa1ddf73f64cf840fbdc1f4c5b9c4b4ec13
 +	* 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.
 +	+ commit 5499942571a88a1223a7318992605c6d29858866
 +	* 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.
 +	+ commit 402aa0f94854bb00475c934be5ca6043a4632126
 +	* 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.
 +	+ commit 9ae48b173c93f4747a9826beb1fbd023c4362c22
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
 +
 +	Require Libgcrypt 1.6.
 +	+ commit b27161cd0c76ae6e2381f60c3a502cde3a2aaa21
 +	* 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.
 +	+ commit abd922e79b2ff63a5a763a30d4a06a91f93d0b12
 +	* 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.
 +	+ commit 037dea9dd5eac7a74df0e12cb437e71fb0732afa
 +	* 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.
 +	+ commit 32989ad2b152d18198d718bc2c7232ce3e79c72f
 +	* 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.
 +	+ commit a15c35f37ed2b58805adc213029998aa3e52f038
 +	* 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.
 +	+ commit de7e15c6b80164a351586e9087aad86420c8b89e
 +	* 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.
 +	+ commit b66158cac7347e4c56c79ab7b5416ae5b3f4a0a2
 +
 +
 +2013-10-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: add pinpad readers information for PC/SC service.
 +	+ commit 5efcc2b8fee8de31d255d09037f0a1e6209eab32
 +	* 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.
 +	+ commit e0ab665a792ada6470cb8885b8427acc3c960998
 +	* 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.
 +	+ commit e6175055fbca958b7fa43aaf84359574ca7f3ebb
 +	* 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.
 +	+ commit 0899f6d4be0406c9efbf9c3f342825804f359b5a
 +	* 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.
 +	+ commit 6466db10fb22a4f24df4edad9c5cb33ec67321bd
 +	* 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.
 +	+ commit 244587ea41d4c75cb5570356f09a6705864a7e8d
 +	* scd/app-nks.c (parse_pwidstr): Always init r_pwid.
 +
 +	gpg: Use 2048 as the default keysize in batch mode.
 +	+ commit 4c3b35b067a4e7002bb6473b879b551014bb7857
 +	* g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
 +	2048.
 +
 +	gpgtar: Fix building for systems with a separate libintl.
 +	+ commit 12990efb45ee7c425167aad19fe759d5609c5182
 +	* tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
 +
 +	scd: Use vendor and product id macros also in apdu.c.
 +	+ commit fc31d730d8506b069de1d3529ed26660856bf07f
 +	* 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.
 +	+ commit 95a3bffeaf07e8bf9487d4b165c336d166236fc1
 +	* 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.
 +	+ commit cc67918c088e90c1d9a507af5f6288e8faa93d87
 +	* 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.
 +	+ commit 3adfaa9beee4502479b5673c7dfd386680a920c5
 +	* 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.
 +	+ commit fdbf76eee6a4e81b040d423926b71af7b491fb4a
 +	* agent/command-ssh.c (stream_read_string): Do not assign to a NULL
 +	ptr.
 +
 +	gpg: Make decryption with the OpenPGP card work.
 +	+ commit 780ba3233618393835970bac4cf8aab713f4d7fa
 +	* 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.
 +	+ commit 04e2c83f189cc56342e1be784bdc63761ccdb5bb
 +	* 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.
 +	+ commit b6d54f1196d5f110fd94dfd661e74dbc60ca9811
 +	* scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.
 +
 +	scd: fix Vega for Alpha reader.
 +	+ commit 54cbab29c700db2df74e808f16db49170e6c42f1
 +	* 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.
 +	+ commit 5c5e52df4b92e23045ac87abac09357de58920d4
 +	* 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.
 +	+ commit 7bde2bf3b0ddb5d3515a44879e1a7ddb581a5c0b
 +	* 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.
 +	+ commit 50c98c7ed6b542857ee2f902eca36cda37407737
 +	* 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.
 +	+ commit 498b9a95dc65c43240835d64cc92d8fb43014d53
 +	* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
 +
 +2013-08-01  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix recent patch 9ff72e4.
 +	+ commit ca6fe88c0068f8d45ef39df0fc7b161998a91fe9
 +	* common/homedir.c (check_portable_app): Fix the name of the control
 +	file.
 +
 +	agent: Include missing prototype.
 +	+ commit ef6a6d973c2bcc54006c04dc41f978ff01005c97
 +	* agent/protect.c: Include cvt-openpgp.h.
 +
 +	w32: Add code to support a portable use of GnuPG.
 +	+ commit 9ff72e4e7e4f56c241a525479a94ed4c95efc23f
 +	* 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.
 +	+ commit db4651734fe91935b17876dc9194329b00066eff
 +	* configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
 +
 +	dirmngr: Define missing LDAP constant.
 +	+ commit ef2e2e54020c3475bf2129c3ec8360c7bad3a6c9
 +	* dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
 +
 +	scd: Fix a syntax error for Apple and Windows.
 +	+ commit 25b0357bf0a4861a751cfbc3e0335ae05c8b2b1b
 +	* scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
 +
 +	common: Fix a build error when using adns.
 +	+ commit ffa7472db551f12f66b9789c31fabb5fc80cc13a
 +	* 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.
 +	+ commit f101f34fffee4a02e7a5f62b59667e45e50e8325
 +	* common/w32-reg.c (write_w32_registry_string): Comment out.
 +
 +	dirmngr: Remove unused file.
 +	+ commit 2830fcb83c99289a49da0e111766daf2d9a1fa3b
 +	* dirmngr/get-path.c: Remove.
 +
 +2013-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Remove cruft from source files.
 +	+ commit f254497e09fa4e0e24e63d14f7316fc31c938844
 +	* sm/keydb.c, sm/keydb.h: Remove disabled code parts.
 +
 +	Prepare for newer automake versions.
 +	+ commit 043e2728c813299fafcf62cd125ecf872b26179e
 +	* 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.
 +	+ commit 136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2
 +	* 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.
 +	+ commit 7777e68d0482c942f527e91c04adbcfb40bc8bef
 +	* 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.
 +	+ commit cb6a64bb78296c8e9f72df0c482ff847e89a1541
 +	* 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.
 +	+ commit 0f0e0559f9b160824f10dc17b389268cdb53aea4
 +	* agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
 +	gcry_sexp_canon_len.
 +
 +	agent: New option --disable-check-own-socket.
 +	+ commit f2d8a14e1b12534eba69d595a62c78f92331e11b
 +	* 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.
 +	+ commit 88e24341e57c96e31a25e92e09d67989e64cc1c1
 +	* 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.
 +	+ commit 2c3fc4719b92d9e3ac32efd134a930e1cc126032
 +	* 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".
 +	+ commit 151b78cc26d728e9eb42620e0caf8c6f4bd7f839
 +	* 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.
 +	+ commit d6798d261cbe6519ef5b3ebb474e2ad348442c0c
 +	* 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.
 +	+ commit e498180d5647d3427a7d7e6c82a9f09cf1ba439d
 +	* common/estream.c (es_func_fp_write): Call fflush after fwrite.
 +
 +2013-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Formatting fixes.
 +	+ commit ff6115227a1ced14e2fb3d160a12181b9dfbc502
 +	* 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.
 +	+ commit 021767d8aa11aac8ac87dc3a31969ee6cfa65966
 +	* 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.
 +	+ commit 07227279c44e3af0939f90025a0d22b782d0f185
 +
 +
 +2013-03-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC status fix.
 +	+ commit 64b1a2cf6f18348544a2d2cd4d49fd27bf01c150
 +	* 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).
 +	+ commit b9aceaa442914beb4f5359283053b43ba5a46b4c
 +	* 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.
 +	+ commit 1062893832bb15eaac853f52e1cb673e5e03790a
 +	* 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.
 +	+ commit ee95c23fcdc6673db0fc7287ab2197915d9b55b3
 +	* 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.
 +	+ commit a75a08d6e30e93e1793aa78a15d473a3ea7623cb
 +	* po/LINGUAS: Enable ja.po.
 +
 +	scd: change default value of pinpad maxlen.
 +	+ commit ca66f5c779af74d0eb7221afd7a9707201931e50
 +	* 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.
 +	+ commit 2739834206f23833161898a73427b8a9c6d5d26d
 +	* 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.
 +	+ commit 44159b681f8f09000fabfc3ee294d5821578d3a6
 +	* 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.
 +	+ commit c4dbd1b2de8ae3847a040444e86500848868bcf4
 +	* 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.
 +	+ commit b693ec02c467696bf9d7324dd081e279f9965151
 +	* 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.
 +	+ commit 4bde12206c5bf199dc6e12a74af8da4558ba41bf
 +	* 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.
 +	+ commit 76dc5c08dc2686eef32e1bd221c60fe91201246f
 +	* scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
 +	APDU.
 +
 +	scd: fix missing close paren.
 +	+ commit 006782068e4d2a9413770400494421a2e9726ee7
 +	* scd/app-openpgp.c (du_auth): Fix.
 +
 +2013-03-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support ECDSA signing.
 +	+ commit 73ad742deacfe2bf7d6efc7cc30f9ced2d83521a
 +	* 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.
 +	+ commit 010bc7f4f06d8affb98950e1adc76c68bfcc9abb
 +	* 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.
 +	+ commit 5bac5040dc93343e1e89916b263390b0e52040bf
 +	* 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.
 +	+ commit ef1983d58b913306e9bf02a7189e530123839c59
 +	* 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.
 +	+ commit 585d5c62eece23911a768d97d11f159be138b13d
 +	* 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.
 +	+ commit c6b8f05517228c6aeab28d2bf5da7724c059bb1a
 +	* 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.
 +	+ commit 161674118d568025896026ede5e03d26bdfdfa68
 +	* 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.
 +	+ commit baee681d2406530c45fd6d4bde77193ba23ac263
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	+ commit 2838385e76c8c7108bc949d5a1d1c947051bd5be
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +	Remove build hacks for FreeBSD.
 +	+ commit 21f5a9ec27c0794141a835a5bb3c69495ee554a6
 +	* 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.
 +	+ commit 3c3648e720b8014828573bd708c88ba4775014e3
 +	* 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.
 +	+ commit 7d376ffa321d4af6e62a2bc64ef2b8574b122b1a
 +	* 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.
 +	+ commit 273bb38cd7b517460cb3de67662e96e910104675
 +	* 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.
 +	+ commit 18a261b65fd77a9e434b13483ceaaaf2176f1197
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	+ commit 4af0c62b15c51056dc293c8e3b907e7c41fbf08c
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +2013-02-20  Werner Koch  <wk at gnupg.org>
 +
 +	Remove build hacks for FreeBSD.
 +	+ commit 8e5766c38f3ac376fb8e7c7f2b0f65de23d84cbe
 +	* 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.
 +	+ commit b90506ea220860c89128f002bd593d0462a08d73
 +	* 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.
 +	+ commit 30f8a3c8736451d8c06ef72521a8da5eabf23016
 +	* 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.
 +	+ commit 595ab0da666c43a1315a72a1346ee149998d8771
 +	* doc/help.ja.txt, po/ja.po: Updated.
 +
 +2013-02-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Rename 'keypad' to 'pinpad'.
 +	+ commit 7253093addfd82a8dd25cd80e3ba820a85e3c9a7
 +	* 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.
 +	+ commit 21feecd48f990b2569cb4b385dea3e57b9501525
 +	* 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.
 +	+ commit 8b2b8dfe5c4cd346bbea2c228e75737bbeeca4c4
 +	* 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.
 +	+ commit 4483a4f0ea030046137ba04905eb5220c14a2161
 +	* agent/protect.c (hash_passphrase): Handle an empty passphrase.
 +
 +2013-02-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix check_keypad_request.
 +	+ commit c27315fc6466cceb862c9e67755a8e044e9b7688
 +	* scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
 +
 +	SCD: Add vendor specific initalization.
 +	+ commit e791ac6683bfb90d5e40c0103324784bd58535c9
 +	* 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.
 +	+ commit 0407e642f796fb2780a77b7a1a86731d0de27e5d
 +	* scd/app-openpgp.c (parse_login_data): Support P=N format.
 +
 +	SCD: Better interoperability.
 +	+ commit bd5eded73a1268afdf81482f8408e5f640abf9c4
 +	* scd/apdu.c: Fill bTeoPrologue[2] field.
 +
 +	SCD: Defaults to use pinpad if the reader has the capability.
 +	+ commit a9ff97a10f7ae5a703ed1bccba294473ecc88d5d
 +	* 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.
 +	+ commit 334ba6efa5a05d8849fae213128a0505e7615e13
 +	* 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.
 +	+ commit d5bf83a24cf3871b7d8cfe61049f70e1e206d09a
 +	* scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
 +
 +	SCD: Add support of Covadis VEGA_ALPHA reader.
 +	+ commit 82e1e837c29225cd55642b193cc04ce6191d19bb
 +	* 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).
 +	+ commit 3aae780f9debaeb3560ff866b7e09d0923481c57
 +	* 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.
 +	+ commit 40a914a2e3052847b49c4b5e8ac8538e97efd18a
 +	* 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.
 +	+ commit b526f6e223604b7c1852ef2aab9fc1ea691b1181
 +	* 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.
 +	+ commit ca89277cb4cb9558da97a71a4cb070cb77c9b536
 +	* 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.
 +	+ commit d9f6cc7502793ed41928042cc2f968c8c7effc22
 +	* 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.
 +	+ commit 50a7badbdacac8ba472b35090c1aab4568434d04
 +	* common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
 +	(STATUS_SIEXPIRED): Remove unused codes.
 +
 +	gpg: Add status line PINENTRY_LAUNCHED.
 +	+ commit 1cd6445eec4c3642ad92afb02f3563a01cc10c10
 +	* 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.
 +	+ commit 19994466449a93704d38d429ca1ea36f63da0bf0
 +	* 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.
 +	+ commit 60c58766aeb847b769372fa981f79abac6014500
 +	* 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.
 +	+ commit 7a638c094fa1aa7ed1d9caf085af9980a2664d64
 +	* configure.ac (build_scdaemon_extra): Remove $tmp cruft.
 +
 +2013-01-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Hold lock for pinpad input.
 +	+ commit 4dddf32c83f52483d95d7770232e9e808558e702
 +	* 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.
 +	+ commit b11f84b858bad867f1062977a7aba30299157e90
 +	* 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.
 +	+ commit 492792378dc7a79316ef742b2ffaa46c6cda282a
 +	* 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.
 +	+ commit 5c565512b8af73bee2a176530663154b9277ef1c
 +	* common/logging.c (log_clock): Print in microseconds.
 +
 +	gpg: Remove a function wrapper.
 +	+ commit f3f5721e6843a08d1011875400f385b8cd5fe226
 +	* 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.
 +	+ commit a776f660363d20b6cc023609c4547e0aa8825d97
 +	* 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.
 +	+ commit f6d7b3f1ee5eed32bc3257c99cb878091d26c482
 +	* 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.
 +	+ commit 0baedfd25a4bdc6c8e7aefbd67006b063e2dc33f
 +	* 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.
 +	+ commit fb31462e7e92d4b19256e6fd40b1b6ffcef2676c
 +	* 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.
 +	+ commit 7d00e52bd58d9e40c18dcc0122b2c236ef3318f5
 +	* 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.
 +	+ commit bb51edc31e6595e38fcbd91d470de57d3a1a7150
 +	* 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.
 +	+ commit 05a4458e5721a0afd600f0ec908e739fa83d58f2
 +	* po/ja.po: Fix fuzzy translations.
 +
 +2013-01-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	+ commit 709a8f8125b9ba5e1ad1e6268cca5ac96d478f63
 +	* po/ja.po: Update with POT.
 +
 +	Update Japanese Translation.
 +	+ commit 0fae789c4125dd8492ed25bd6728b5ac98f19729
 +	* 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.
 +	+ commit 79f08fb0699f4a065e3a29bc7676a90534d7ba60
 +	* 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.
 +	+ commit 564d10ea5cd29685a00a4096d69ae2476b60506f
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
 +
 +	gpg: First working support for keyboxes.
 +	+ commit a9863834244fc2a58d8950977243702d12e420a1
 +	* 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.
 +	+ commit f7495f1004071a0ceac394007bb37f88d7a3467f
 +	* 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.
 +	+ commit 91e61d52539b1808e209c43e51465c76cebb06f9
 +	* 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.
 +	+ commit f0b33b6fb8e0586e9584a7a409dcc31263776a67
 +	* 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.
 +	+ commit d61f7402f2b0f6dd288e403ed9408fd65e617f85
 +	* g10/sign.c (update_keysig_packet): Use digest_algo.
 +
 +	(cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
 +
 +	gpg: Suppress "public key already present" in quiet mode.
 +	+ commit 8325d616593187ff227853de0295e3269b96edcb
 +	* 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.
 +	+ commit 41d564333d35c923f473aa90625d91f8fe18cd0b
 +	* 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.
 +	+ commit 6177fb3c87f485fb654bbba492d04508755718b3
 +	* 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.
 +	+ commit e7dca3e83ebd6df0a7ea55e97c3cd6e91be90af5
 +	* 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.
 +	+ commit 649b31c663b8674bc874b4ef283d714a13dc8cfe
 +	* 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.
 +	+ commit f76a0312c3794afd81fe1e172df15eb0612deae0
 +	* 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.
 +	+ commit d2777f84be0ded5906a9bec3bc23cfed0a9be02f
 +	* 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.
 +	+ commit 25fb53ab4ae7e1c098500229c776d29b82713a20
 +	* 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"
 +	+ commit 36ba7845995dd3caf8faeec3e09b3ffb879fc29b
 +	* agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
 +	an invoked process.
 +
 +	config: Update npth.m4.
 +	+ commit ceab60b59d907354d323ace09d7b3f2d36d330fb
 +	* m4/npth.m4: Take from current npth master.
 +
 +2012-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Revert SCD changes of 2010-05-03.
 +	+ commit 1e1326aeb8923782138e133f091afec41d969c40
 +	* 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.
 +	+ commit baf7b09e124f9eb4ca4b8ee02474ee7710a95a40
 +	* 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.
 +	+ commit b8eb2ab56971a309353ae2682bc6ef1357e9ac53
 +
 +
 +	Adjust awk to not add trailing whitespace.
 +	+ commit 3f8ad564674431b4c0c6cff259f02248c80a6ef9
 +	* 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.
 +	+ commit 7602d9e3edda99b0b65ba928eef435dab04ecd09
 +	* 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.
 +	+ commit 3d2da6c82163ffbc2e827abc4144dc3197ed53db
 +	* g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
 +
 +2012-11-26  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Check for inet_addr() in -lnsl.
 +	+ commit 66331e138ec17e176cc3f45bb095820866d5358c
 +	* configure.ac: Check for inet_addr() in libnsl.
 +
 +2012-11-20  Werner Koch  <wk at gnupg.org>
 +
 +	Do not use a broken ttyname.
 +	+ commit 835698b72bc509565aad52b0753f1c56c1a8f062
 +	* 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.
 +	+ commit e7bc5012c568da9ceb0a80a8f3fe3edf3dac9564
 +	* autogen.sh: Remove option -c from chmod.
 +
 +	Improve parsing of the GIT revision number.
 +	+ commit 011faa0c68cf0c628ef581193166e9ac9bf22b71
 +	* configure.ac (mmm4_revision): Use git rev-parse.
 +
 +	Add an OpenPGP card vendor.
 +	+ commit ac775780fef3ef63f896e822add9ff6ea7e5119c
 +	* 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.
 +	+ commit 9f0e9ea80ca30269770eb955e33b54401bff917f
 +	* agent/command.c (clear_outbuf): Use wipememory.  Suggested by Ben
 +	Kibbey.
 +
 +	Allow decryption with card keys > 3072 bits.
 +	+ commit 905b6a36d3ca21b2f619721e1de892398e5eb759
 +	* 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.
 +	+ commit 8f8c29d24ca13f987e6c118702b428a2051b7072
 +	* 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.
 +	+ commit 8df89f3e9cf0255f11011c2f1df0d419a5c23a8c
 +	* 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.
 +	+ commit 76055d49d1c8b8e4f6245e6729cae81b1eaecbf6
 +	* po/fr.po: Update.
 +	* po/LINGUAS: Enable fr.
 +
 +2012-08-24  David Prévot  <taffit at debian.org>
 +
 +	Fix typos spotted during translations.
 +	+ commit ba591e2f14c0d85ba15346ffd04b9e7d72ec89dc
 +	* 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.
 +	+ commit bf95408fc33709d154cd41566d33af3ec3c48886
 +	* 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.
 +	+ commit 1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f
 +	* 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.
 +	+ commit 8156a38674421deef6c2eb3e91e0186fe7fe4b26
 +	* 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.
 +	+ commit ca8eec8e28abb8473d02dbaf8d61cfb1094c5c50
 +	* 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.
 +	+ commit 096e7457ec636bcfcf128678660eb2f2e19f113a
 +	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.
 +	+ commit fc00d3fcb201476b3495f47138fa35b71c52f403
 +	* g10/keylist.c (list_keyblock_colon): Print digest_algo.
 +
 +	Fix type conflict warning.
 +	+ commit f8a8c71c41bc1893df8af6ce522876ccbf6240a9
 +	* 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.
 +	+ commit 68777b40dcf215305a325185f6bd9cfd6dcc0542
 +	* 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.
 +	+ commit b4d9f8dbc8e074cd91bbd3e2e54e2b77c9268d1a
 +	* 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.
 +	+ commit 59b77f9ea7dfa4d5c74573d2186c9a3e129ab3bf
 +	* po/de.po: Update.
 +
 +	common: Remove generated files only during maintainer-clean.
 +	+ commit d800fa5ce6102e069305f8e1a5d55d18ac3a1993
 +	* 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.
 +	+ commit 0f02fba19df16c82ca1ad44a8cb09f952d755598
 +	* 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.
 +	+ commit 8d7522837c6dba3065d24594bcdbe7b99a702cde
 +	* 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.
 +	+ commit 20c9ac4df34e25f7085bb4e4ab5ea7223932f5c4
 +	* dirmngr/crlcache.c (open_dir): Ensure that both this_update
 +	and next_update member strings are NUL-terminated.
 +
 +	remove doubled words in a comment.
 +	+ commit 6e3882785a629b361c57c8b9d5cad51fb234ac23
 +
 +
 +2012-04-20  Werner Koch  <wk at gnupg.org>
 +
 +	Change license for some files in common to LGPLv3+/GPLv2+.
 +	+ commit 37df3d5f593f76ddbf1b9dc6de0173b7bb85c0ad
 +	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.
 +	+ commit bee0ac28c9c8027540ae56900b9f85e0bd555f1d
 +	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.
 +	+ commit f1e1387bee286c7434f0462185048872bcdb4484
 +	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.
 +	+ commit 99fc61f1cf09c7f72a9037d91d3cf0cd2e035ae6
 +	Note INQUIRE_MAXLEN.
 +
 +	Document PASSWD --preset.
 +	+ commit a577f06c4aecc0af5b492e15812e9150c747cbe4
 +
 +
 +	Document GENKEY options.
 +	+ commit 108e8f622ef9cfa256707debec1d379ce3cf21ca
 +
 +
 +	Document PRESET_PASSPHRASE.
 +	+ commit 96e107fc29db625b247022ae1bf2cbe90b939c5d
 +
 +
 +	Document CLEAR_PASSPHRASE.
 +	+ commit 26b59d78c43d72fa28609fb2c0d80fb377393127
 +	And describe the --mode=normal option.
 +
 +2012-03-27  Werner Koch  <wk at gnupg.org>
 +
 +	Fix timegm regression test.
 +	+ commit 17499e761e8cd0fe867b5b5f3e42a71b6d45f954
 +	* 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.
 +	+ commit de01c51ecb3918f427aa76281351749c8ad07ed6
 +	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.
 +	+ commit 7ddbcb6b6ab8b26c8e609fcd95c2c8a89bc20a7d
 +	* g10/mainproc.c (proc_compressed): Remove superfluous check for
 +	compress algorithm 0.  Reported by pfandrade.  This is bug#1326.
 +
 +	Add mksamplekeys script.
 +	+ commit 7441e622ffb3296686bd0d7f04b4051466aaad38
 +	* doc/mksamplekeys: New.
 +
 +2012-02-28  Marcus Brinkmann  <mb at g10code.com>
 +
 +	Replace npth_yield in busy wait by npth_usleep.
 +	+ commit 8f8c6594147608b1021c16fc3561feb96da5d55a
 +	* 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.
 +	+ commit 76ff42ef8d1232dd36bf48c1020b0b9b2afb1c7d
 +	* 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.
 +	+ commit b817ae7df947093384a25797999a9aa187e20f9c
 +	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.
 +	+ commit 12ea5c904c0008a2adec2e8bbe45dac629548e7d
 +	* 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.
 +	+ commit e78585cd0f553d92f332e33810ab636758bc88a2
 +	* 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.
 +	+ commit 8d8d740bfd73d8764a03220c0b0c949e03fea351
 +	* po/uk.po: New.
 +
 +	common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
 +	+ commit 13ec74481ce0137f7a60b3256cc4840073c77efa
 +	* 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.
 +	+ commit 115a6ed55d1f6be33f66de6734359fa590ca3749
 +	* configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
 +
 +	agent: Simplify printing of INQUIRE_MAXLEN.
 +	+ commit 7981cdd1345d51fd917b2375691ead60c24db2cd
 +	* 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.
 +	+ commit 1a0df8506050448f16c63666850e3ae6d94a971b
 +	* 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.
 +	+ commit eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a
 +	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.
 +	+ commit ecda65498ac60dfde50fbbc71cd0cc321d7175a9
 +	* 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.
 +	+ commit 3f7788f2e035eb939abb27b3a53854ec0fc6178c
 +	* 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.
 +	+ commit 2b3cb2ee94625498e7a7f939216c9bcddef6ec20
 +	* 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.
 +	+ commit bdde44ae8d4709e33c09781c3d37a5da2c7a5e0d
 +	* 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.
 +	+ commit 2871422d9a889cb632f59efda4d9cd170fc9fca7
 +	* 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.
 +	+ commit cf748e8736b984194345bfd74887b35d3d23fa37
 +	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.
 +	+ commit 3da10eefcb09a520f11e4fae7f59a33f80ffba69
 +	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.
 +	+ commit 001352077cdc7e402421c77328bea1a052005673
 +	* configure.ac: Remove cruft to allow building without npth.
 +
 +	Require libassuan 2.1.0.
 +	+ commit c254d0f0d13a54777a62dad8f78a8f287d6ae565
 +	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0.  This is due to
 +	the npth changes.
 +
 +	Fix strerror vs. gpg_strerror usage.
 +	+ commit 2be7818c6d916a69ffdf88cce32960949a56e893
 +	This bug was introduced by the migration to npth.
 +	* agent/gpg-agent.c (handle_connections): Use strerror.
 +
 +	Add missing variable.
 +	+ commit a55d2e16f1090264338dc3ad0b2afca28db27c09
 +	* 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.
 +	+ commit 4074f966276be10a794fd63a7f443b9d974d3982
 +	* 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.
 +	+ commit ccbb4c3652ee72386b8889358b829e256e1ebcda
 +	* 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.
 +	+ commit 7a7a59782766a8bde0c3e7156d14bb2b0e4a3951
 +	* 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.
 +	+ commit 495dc68586356891b82a2d2b6367c4131fd17f08
 +	* 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)
 +	+ commit deee8147aab086161c91e6aa6fb41d7148a630f6
 +	* 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.
 +	+ commit e97e2ced6cf3ee295a3cc9f8968969a1910380ea
 +	* 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.
 +	+ commit 7589e43b21c8d80c5a57ecb6eb78dfcd0b5dac46
 +	* scripts/gitlog-to-changelog: Skip merge commits.
 +
 +2012-01-18  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Add the INQUIRE_MAXLEN status message.
 +	+ commit ae981dd8f454e2a8bbc6429bed5abc5e87cc83d5
 +	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.
 +	+ commit 4402dc3f0a5c5d0f26ed2ae97f9cda9cf4e695fa
 +	* doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
 +
 +	gpg-agent: fix lc-messages handling not to change Xauthority setting.
 +	+ commit 37801918cb916ae8c641e003f204dcc70cccb29c
 +	* 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.
 +	+ commit 75a402fc25e4ec9659723dd58306aff3415736f4
 +
 +
 +2012-01-14  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix scdaemon pinentry inquire cancelation.
 +	+ commit 4f21f8d6e109eae111d2da91f4c946afda4174e4
 +	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.
 +	+ commit 30ec869b8c63f1edcc58110ed20b83b0e77248f8
 +	* 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.
 +	+ commit b42bc48dfb4b6d4f745eb02d8de4f4dcffdacf48
 +	* 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.
 +	+ commit 860861279bc17dd80eecc9631c4ae5d161a335fd
 +
 +
 +2012-01-10  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
 +	+ commit 3f59561cee635c6801e0a59d3abff1c064fcbdbe
 +	* 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.
 +	+ commit 957fe728466893bc63f5ccad197d3e245dca4bf3
 +	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.
 +	+ commit 372fb4fc0661014ccd9275c89e6da2208f87155f
 +	* 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.
 +	+ commit 5988c8bfb7eafaca53c8abeb793f189acd3177c6
 +	* 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.
 +	+ commit ed432f030e604f7b2fd4a79c2110d92b9cde7501
 +	* sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
 +
 +	Revert last change, add comment about link() return values.
 +	+ commit ff2095ad7b4be7eaf9468b6ef39fd979527ecc4f
 +	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
 +	return value of link().
 +
 +	Fix compiler warnings.
 +	+ commit 0dce26778ef8abd4fc40de689d7ec9b720d26430
 +	* 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.
 +	+ commit 61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405
 +	* 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.
 +	+ commit 682df45d15661ed3544e2ed34bcb636200cc40f9
 +	* dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
 +
 +	Terminate csh commands with a semicolon.
 +	+ commit d01d9ff11f46cbd61b7b8c0e04431e4f0c4a8580
 +	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.
 +	+ commit a2d9e48fcca6cfc2dfadef6dbd3579a30314676b
 +	* 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.
 +	+ commit c6aaf024651c7d55ac9fb77a53c084efb3adc1a9
 +	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.
 +	+ commit 97d1c884e62bba94e42bb5b2bb13cd3880334c31
 +
 +
 +	Release 2.1.0beta3.
 +	+ commit 604c130a85d4203b9d84137a42673aeaff1c0bd1
 +
 +
 +	Prepare for the beta3 release.
 +	+ commit 8e47f1e576f70d4dbe966523057fe3078006ae8b
 +
 +
 +	po: Update the German translation.
 +	+ commit 6f02c143440865781b4e3c1753e24e55a0de40e4
 +
 +
 +	Add the STEED Self-Signing Nonthority certificate.
 +	+ commit fe2f1826991e8130f727ee15df1a4651f679752f
 +	* doc/com-certs.pem: Install it when creating a keybox.
 +
 +	faq: Add section on US export restrictions.
 +	+ commit 779611494dbd187d09b05d2eb10faabd31a70156
 +
 +
 +	Require Libassuan 2.0.3.
 +	+ commit 366512abe44d9e71bb2c699c29477afa6ac71cdd
 +	* 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.
 +	+ commit 07f20f313a0b13e5c93168a8a62ff1cbb94a4514
 +	* 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.
 +	+ commit f4b7f7146349c388a2f3ce224ff2006606c66232
 +	* 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.
 +	+ commit f6251c0d0af92331388f5e9bcd1750cbadcaca8f
 +	* 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.
 +	+ commit a98260c39f1c0ccdad004784cbc9440376766082
 +	* 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.
 +	+ commit 27089564b6453deaf7b4ffe7cc5f5f290b6d892b
 +	* scd/app.c (select_application): Reorder application tests.
 +
 +	scd: Add option --dump-atr to command APDU.
 +	+ commit b22d62bd1481dfe13d60a6d16b09b9297944f063
 +	* 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.
 +	+ commit 7737a2c269657189a583cde7f214f20871d264f8
 +	* 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.
 +	+ commit 792e137ec7997a0ff5c54ff970611238d28d4ba8
 +	* scd/app.c (select_application): Skip serial number reading.
 +
 +	scd: Add more status word values for documentation.
 +	+ commit 0bac31ee9f74a25d76b08c3e0355a338908f083a
 +
 +
 +	scd: Add the "undefined" stub application.
 +	+ commit dcd64131c60efd0189aa05d5dbce6b93547b04e3
 +	* scd/app.c (select_application): Implement the "undefined"
 +	application.
 +
 +	agent: Pass comment lines from scd verbatim thru gpg-agent.
 +	+ commit 45cf9de341405a228e331bd3893cbcd6b72306be
 +	* 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.
 +	+ commit 2d91febbd8d30beb7eb33f7aa80ffd5691d1d3cc
 +	* 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.
 +	+ commit 07ea8c56b507b06d4bd70e94fa51914659afac4b
 +	* 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.
 +	+ commit 00c760f628f4cf0fc11e79d305c172f98123f815
 +	* 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.
 +	+ commit 24e121ef261731069868ca403b818f1168237f53
 +	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.
 +	+ commit 11164662788036c4b15d30555ea33ec0b6f5a670
 +	* scd/command.c (cmd_serialno): Retry once for an inactive card.
 +
 +	Fix detection of card removal and insertion.
 +	+ commit cd29dc0f1cf7f3bd7938ffa65bf13f9a75d8c156
 +	* 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.
 +	+ commit ea0a21410b8fa460882c0f8de90b9291345fd4fc
 +	* 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".
 +	+ commit 8a12a2000d82acfa881e8c18d028290100bf5e43
 +	* 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.
 +	+ commit 14e4fdc9f97d6f12bf563adfff1e3157305d7795
 +	* Makefile.am (gen-ChangeLog): Supply --append-dot.
 +
 +	Allow comments which will not show up in the ChangeLog.
 +	+ commit cd3732841de32ce5c7841e6e158df3a5f1102f86
 +	* scripts/gitlog-to-changelog: Ignore lines after a "--" line.
 +
 +2011-12-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Allow specification of an AuthorityKeyIdentifier.
 +	+ commit 596b84a4de58def2155d3fe56462f6607f135b69
 +	* 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.
 +	+ commit 5cdad8ff000152b4bd01953646bb87fe8703c70d
 +	* 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.
 +	+ commit 3f284e40502d8181b0b3ea66c77cd7c1252ea781
 +	* sm/certreqgen.c (create_request): Fix hex-bin conversion.
 +
 +2011-12-05  Werner Koch  <wk at gnupg.org>
 +
 +	Fix last change.
 +	+ commit 9274d4d18281b3364fa8abaa821dddf124b105d7
 +	* agent/command.c (start_command_handler): Remove use of removed var.
 +
 +	Amend the agent code with more comments.
 +	+ commit 477360e8cdc458b0a36e9c7fb52a35f27766255d
 +	* 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.
 +	+ commit 239659d3a0b8c0c378734ca3d1e9210a02e24da7
 +	* 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.
 +	+ commit 96dc146fa17a7853277dbf3dc771c585a815c247
 +	* 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.
 +	+ commit bf37c32367ba149559385ee90b6435cef8bd6412
 +	* 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.
 +	+ commit 29e96e6b9a8e68e6554dd48bc2ce68ae9525d29f
 +	* autogen.sh: Install commit-msg hook for git.
 +
 +	Generate the ChangeLog from commit logs.
 +	+ commit 2336b09779d313c1594acf6df3bd8a8486e90458
 +	* 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 d302656,0000000..f316ecb
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.18
++2.1.19
diff --cc common/status-codes.h
index 6be226d,0000000..9ff279c
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,238 -1,0 +1,240 @@@
 +/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 +
 +/* status.h - Status codes
 + *	Copyright (C) 2007 Free Software Foundation, Inc.
 + *
 + * This file is part of GnuPG.
 + *
 + * This file is free software; you can redistribute it and/or modify
 + * it under the terms of either
 + *
 + *   - the GNU Lesser General Public License as published by the Free
 + *     Software Foundation; either version 3 of the License, or (at
 + *     your option) any later version.
 + *
 + * or
 + *
 + *   - the GNU General Public License as published by the Free
 + *     Software Foundation; either version 2 of the License, or (at
 + *     your option) any later version.
 + *
 + * or both in parallel, as here.
 + *
 + * This file is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, see <https://www.gnu.org/licenses/>.
 + */
 +
 +/* The purpose of this complex string table is to produce
 +   optimal code with a minimum of relocations.  */
 +
 +static const char statusstr_msgstr[] = 
 +  "ENTER" "\0"
 +  "LEAVE" "\0"
 +  "ABORT" "\0"
 +  "GOODSIG" "\0"
 +  "BADSIG" "\0"
 +  "ERRSIG" "\0"
 +  "BADARMOR" "\0"
 +  "TRUST_UNDEFINED" "\0"
 +  "TRUST_NEVER" "\0"
 +  "TRUST_MARGINAL" "\0"
 +  "TRUST_FULLY" "\0"
 +  "TRUST_ULTIMATE" "\0"
 +  "NEED_PASSPHRASE" "\0"
 +  "VALIDSIG" "\0"
 +  "SIG_ID" "\0"
 +  "ENC_TO" "\0"
 +  "NODATA" "\0"
 +  "BAD_PASSPHRASE" "\0"
 +  "NO_PUBKEY" "\0"
 +  "NO_SECKEY" "\0"
 +  "NEED_PASSPHRASE_SYM" "\0"
++  "DECRYPTION_KEY" "\0"
 +  "DECRYPTION_INFO" "\0"
 +  "DECRYPTION_FAILED" "\0"
 +  "DECRYPTION_OKAY" "\0"
 +  "MISSING_PASSPHRASE" "\0"
 +  "GOOD_PASSPHRASE" "\0"
 +  "GOODMDC" "\0"
 +  "BADMDC" "\0"
 +  "ERRMDC" "\0"
 +  "IMPORTED" "\0"
 +  "IMPORT_OK" "\0"
 +  "IMPORT_PROBLEM" "\0"
 +  "IMPORT_RES" "\0"
 +  "IMPORT_CHECK" "\0"
 +  "EXPORTED" "\0"
 +  "EXPORT_RES" "\0"
 +  "FILE_START" "\0"
 +  "FILE_DONE" "\0"
 +  "FILE_ERROR" "\0"
 +  "BEGIN_DECRYPTION" "\0"
 +  "END_DECRYPTION" "\0"
 +  "BEGIN_ENCRYPTION" "\0"
 +  "END_ENCRYPTION" "\0"
 +  "BEGIN_SIGNING" "\0"
 +  "DELETE_PROBLEM" "\0"
 +  "GET_BOOL" "\0"
 +  "GET_LINE" "\0"
 +  "GET_HIDDEN" "\0"
 +  "GOT_IT" "\0"
 +  "PROGRESS" "\0"
 +  "SIG_CREATED" "\0"
 +  "SESSION_KEY" "\0"
 +  "NOTATION_NAME" "\0"
 +  "NOTATION_FLAGS" "\0"
 +  "NOTATION_DATA" "\0"
 +  "POLICY_URL" "\0"
 +  "KEY_CREATED" "\0"
 +  "USERID_HINT" "\0"
 +  "UNEXPECTED" "\0"
 +  "INV_RECP" "\0"
 +  "INV_SGNR" "\0"
 +  "NO_RECP" "\0"
 +  "NO_SGNR" "\0"
 +  "KEY_CONSIDERED" "\0"
 +  "ALREADY_SIGNED" "\0"
 +  "KEYEXPIRED" "\0"
 +  "KEYREVOKED" "\0"
 +  "EXPSIG" "\0"
 +  "EXPKEYSIG" "\0"
 +  "ATTRIBUTE" "\0"
 +  "REVKEYSIG" "\0"
 +  "NEWSIG" "\0"
 +  "SIG_SUBPACKET" "\0"
 +  "PLAINTEXT" "\0"
 +  "PLAINTEXT_LENGTH" "\0"
 +  "KEY_NOT_CREATED" "\0"
 +  "NEED_PASSPHRASE_PIN" "\0"
 +  "CARDCTRL" "\0"
 +  "SC_OP_FAILURE" "\0"
 +  "SC_OP_SUCCESS" "\0"
 +  "BACKUP_KEY_CREATED" "\0"
 +  "PKA_TRUST_BAD" "\0"
 +  "PKA_TRUST_GOOD" "\0"
 +  "TOFU_USER" "\0"
 +  "TOFU_STATS" "\0"
 +  "TOFU_STATS_SHORT" "\0"
 +  "TOFU_STATS_LONG" "\0"
 +  "TRUNCATED" "\0"
 +  "MOUNTPOINT" "\0"
 +  "BLOCKDEV" "\0"
 +  "PINENTRY_LAUNCHED" "\0"
 +  "PLAINTEXT_FOLLOWS" "\0"
 +  "ERROR" "\0"
 +  "WARNING" "\0"
 +  "SUCCESS" "\0"
 +  "FAILURE" "\0"
 +  "INQUIRE_MAXLEN";
 +
 +static const int statusstr_msgidx[] =
 +  {
 +    0,
 +    6,
 +    12,
 +    18,
 +    26,
 +    33,
 +    40,
 +    49,
 +    65,
 +    77,
 +    92,
 +    104,
 +    119,
 +    135,
 +    144,
 +    151,
 +    158,
 +    165,
 +    180,
 +    190,
 +    200,
 +    220,
-     236,
-     254,
-     270,
-     289,
-     305,
-     313,
++    235,
++    251,
++    269,
++    285,
++    304,
 +    320,
-     327,
-     336,
-     346,
++    328,
++    335,
++    342,
++    351,
 +    361,
-     372,
-     385,
-     394,
-     405,
-     416,
-     426,
-     437,
-     454,
++    376,
++    387,
++    400,
++    409,
++    420,
++    431,
++    441,
++    452,
 +    469,
-     486,
++    484,
 +    501,
-     515,
++    516,
 +    530,
-     539,
-     548,
-     559,
-     566,
-     575,
-     587,
-     599,
-     613,
++    545,
++    554,
++    563,
++    574,
++    581,
++    590,
++    602,
++    614,
 +    628,
-     642,
-     653,
-     665,
-     677,
-     688,
-     697,
-     706,
-     714,
-     722,
++    643,
++    657,
++    668,
++    680,
++    692,
++    703,
++    712,
++    721,
++    729,
 +    737,
 +    752,
-     763,
-     774,
-     781,
-     791,
-     801,
-     811,
-     818,
-     832,
-     842,
-     859,
-     875,
-     895,
-     904,
-     918,
-     932,
-     951,
-     965,
++    767,
++    778,
++    789,
++    796,
++    806,
++    816,
++    826,
++    833,
++    847,
++    857,
++    874,
++    890,
++    910,
++    919,
++    933,
++    947,
++    966,
 +    980,
-     990,
-     1001,
-     1018,
-     1034,
-     1044,
-     1055,
-     1064,
-     1082,
-     1100,
-     1106,
-     1114,
-     1122,
-     1130,
++    995,
++    1005,
++    1016,
++    1033,
++    1049,
++    1059,
++    1070,
++    1079,
++    1097,
++    1115,
++    1121,
++    1129,
++    1137,
++    1145,
 +    
 +  };
 +
 +#define statusstr_msgidxof(code) (0 ? -1 \
-   : ((code >= 0) && (code <= 96)) ? (code - 0) \
++  : ((code >= 0) && (code <= 97)) ? (code - 0) \
 +  : -1)
diff --cc doc/defsincdate
index eaa9119,0000000..e491002
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1485162806
++1488375707
diff --cc doc/gnupg-module-overview.pdf
index 62742ea,0000000..787c6d9
mode 100644,000000..100644
Binary files differ
diff --cc doc/gnupg-module-overview.png
index c5c8a30,0000000..e9da9e2
mode 100644,000000..100644
Binary files differ
diff --cc po/ca.po
index bdf89ea,296b374..34e58e3
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -36,7 -35,6 +36,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@@ -47,41 -45,32 +47,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Segur que voleu crear una clau de signatura i xifratge? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -89,7 -78,6 +89,7 @@@ msgstr "la contrasenya és invàlida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -99,75 -87,59 +99,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "la contrasenya és errònia"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "la línia és massa llarga\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "la contrasenya és massa llarga\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "l'MPI és erroni"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "la contrasenya és errònia"
@@@ -177,153 -148,118 +177,160 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "no s'ha pogut obrir «%s»: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr ""
  "no s'ha trobat cap anell secret de escrivible: %s\n"
  "\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "error en crear «%s»: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "canvia la contrasenya"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  #, fuzzy
  msgid "Admin PIN"
  msgstr "Introduïu el nom d'usuari: "
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Repetiu la contrasenya: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Repetiu la contrasenya: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Repetiu la contrasenya: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
@@@ -408,49 -330,34 +415,49 @@@ msgstr "
  "Opcions:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, 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:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -541,11 -431,6 +548,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -561,47 -444,34 +568,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Certificat de revocació vàlid"
@@@ -611,28 -480,22 +618,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
@@@ -660,7 -517,6 +667,7 @@@ msgstr "base de dades de confiança: h
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: no s'ha pogut crear el directori: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -685,12 -537,10 +692,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu claus es descarta\n"
@@@ -712,8 -558,6 +719,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -721,9 -565,6 +728,9 @@@ msgstr "
  "@Ordres:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -777,8 -610,6 +784,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -838,8 -660,6 +845,8 @@@ msgstr "
  msgid "Yes"
  msgstr "sí|si"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -890,19 -703,16 +897,19 @@@ msgstr "canvia la contrasenya
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "activa una clau"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -922,7 -729,6 +929,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@@ -950,22 -752,14 +957,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: 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"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -980,8 -772,6 +987,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -991,12 -780,10 +998,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@@ -1237,8 -978,6 +1244,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1379,7 -1091,10 +1386,12 @@@ msgstr "error en l'última línia\n
  msgid "[none]"
  msgstr "[no establert]"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr ""
  
@@@ -1462,7 -1163,6 +1474,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "no forçat"
@@@ -1521,8 -1210,6 +1533,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1698,8 -1352,6 +1710,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1361,10 +1722,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "La vostra selecció? "
  
@@@ -1785,17 -1417,11 +1797,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -1862,7 -1475,6 +1874,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, 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 -1500,10 +1905,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrodonida fins a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1953,9 -1547,6 +1965,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "La selecció és invàlida.\n"
  
@@@ -2090,23 -1652,15 +2102,23 @@@ msgstr "L'ordre no és vàlida (proveu 
  msgid "--output doesn't work for this command\n"
  msgstr "--output no funciona per a aquesta ordre\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1712,6 +2182,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
@@@ -2209,7 -1744,6 +2221,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2345,42 -1855,33 +2357,42 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: es descarta: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "s'està escrivint en «%s»\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr ""
  "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "AVÍS: no s'ha exportat res\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2664,7 -2104,6 +2676,7 @@@ msgstr "|N|nivell de compressió N (0 n
  msgid "use canonical text mode"
  msgstr "usa el mode de text canònic"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
@@@ -2857,476 -2268,378 +2869,480 @@@ msgstr "AVÍS: els permissos del direct
  msgid "unknown configuration item '%s'\n"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, 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:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra en quin anell de claus està una clau llistada"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, 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:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, 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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, 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:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVÍS: %s té preferència sobre %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s no és permés amb %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s no té sentit amb %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 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:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorisme de xifratge triat no és vàlid\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed ha de ser major que 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed ha de ser major que 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  #, 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:3737
++#: g10/gpg.c:3741
  #, 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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "les preferències per defecte són invàlides\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "les preferències personals de xifrat són invàlides\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "les preferències personals de digest són invàlides\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "les preferències personals de compressió són invàlides\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s encara no funciona amb %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, 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:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "ha fallat el desxifratge: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "la recepció des del servidor de claus ha fallat: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "l'exportació de la clau ha fallat: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ha fallat la cerca al servidor de claus: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "ha fallat el refresc des del servidor de claus: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "no s'ha pogut llevar l'armadura: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Endavant, escriviu el missatge...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  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:5244
++#: g10/gpg.c:5252
  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:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la URL de política de signatura donada no és vàlida\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "pren les claus d'aquest anell"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  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:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|escriu informació d'estat en aquest FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
  
  # Werner FIXME: should it use «Usage»?
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4705,15 -3753,10 +4721,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada]"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4755,7 -3792,6 +4771,7 @@@ msgstr "Esteu segur que encara voleu af
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4790,7 -3820,6 +4806,7 @@@ msgstr[1] "S'ha esborrat %d signatura.\
  msgid "Nothing deleted.\n"
  msgstr "No s'hi ha eliminat res.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "invàlida"
  
@@@ -5038,74 -4019,58 +5054,74 @@@ msgid "Displaying %s photo ID of size %
  msgstr ""
  "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "la preferència %c%lu és duplicada\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "s'està escrivint una signatura directa\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "s'està escrivint l'autosignatura\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "s'està escrivint la signatura de comprovació de la clau\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, 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:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, 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:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "xifra dades"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5119,157 -4084,126 +5135,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr ""
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (només signar)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (només xifrar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notació de signatura: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La grandària sol·licitada és %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5285,7 -4219,6 +5301,7 @@@ msgstr "
  "      <n>m = la clau caduca als n mesos\n"
  "      <n>y = la clau caduca als n anys\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5301,42 -4234,34 +5317,42 @@@ msgstr "
  "      <n>m = la signatura caduca als n mesos\n"
  "      <n>y = la signatura caduca als n anys\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Indiqueu la validesa de la clau (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Indiqueu la validesa de la signatura (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "el valor no és vàlid\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca el %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, 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:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5344,12 -4269,10 +5360,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "És correcte? (s/n)"
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5360,7 -4283,6 +5376,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5377,50 -4299,39 +5393,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nom i cognoms: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "El nom no pot començar amb un dígit\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  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:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Adreça electrònica: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Comentari: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5431,7 -4342,6 +5447,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5448,35 -4358,28 +5464,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoXx"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Corregiu l'error primer\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5488,13 -4391,10 +5504,13 @@@ msgstr "
  "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
  "d'aconseguir prou entropia.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5502,69 -4402,56 +5518,69 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "La generació de claus ha estat cancel·lada.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr ""
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5574,7 -4461,6 +5590,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5583,7 -4469,6 +5599,7 @@@ msgstr "
  "amb el rellotge)\n"
  
  # Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5591,22 -4476,18 +5607,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crear realment? "
@@@ -5689,19 -4554,16 +5705,19 @@@ msgstr "     Empremta digital =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "s'està comprovant l'anell «%s»\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "s'han comprovat %lu claus (%lu signatures)\n"
  msgstr[1] "s'han comprovat %lu claus (%lu signatures)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "\t%lu keys updated\n"
  msgid "%lu key cached"
@@@ -5709,7 -4571,6 +5725,7 @@@ msgid_plural "%lu keys cached
  msgstr[0] "\t%lu clau actualitzades\n"
  msgstr[1] "\t%lu clau actualitzades\n"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5719,7 -4580,6 +5735,7 @@@ msgstr[1] "1 signatura errònia\n
  
  # Fitxer indi fins final.  Hau!  ivb
  # Grrr. Com em tracten els esclaus ja... jm
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: s'ha creat l'anell\n"
@@@ -6026,7 -4824,6 +6042,7 @@@ msgstr "binari
  msgid "textmode"
  msgstr "mode text"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "desconeguda"
  
@@@ -6250,55 -5005,44 +6266,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "el subpaquet de tipus %d té el bit crític activat\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Introduïu la contrasenya\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "s'ha cancel·lat per l'usuari\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (ID de la clau principal %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6740,17 -5401,14 +6756,17 @@@ msgstr "la codificació antiga del DEK 
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -7055,18 -5664,15 +7071,18 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s signatura de: «%s»\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "signatura:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "s'utilitzarà xifratge %s\n"
@@@ -7131,17 -5726,14 +7147,17 @@@ msgstr "error: l'empremta digital és i
  msgid "ownertrust value missing"
  msgstr "importa els valors de confiança"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "error en trobar el registre de confiança: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 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"
@@@ -7178,7 -5764,6 +7194,7 @@@ msgid "%s: directory does not exist!\n
  msgstr "%s: el directori no existeix!\n"
  
  # No em passe! ;)  ivb
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7326,10 -5883,6 +7342,10 @@@ msgstr "error en la creació de la cont
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7361,7 -5909,6 +7377,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7533,11 -6053,9 +7549,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7546,122 -6063,102 +7562,122 @@@
  msgid "resetting keydb: %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
  # Werner FIXME: use ngettext. jm
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "S'han esborrat %d signatures.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "xifrat amb %lu contrasenyes\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Política: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7678,18 -6175,14 +7694,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7741,62 -6225,51 +7757,62 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  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:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, 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:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "si us plau, feu un --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "s'està comprovant la base de dades de confiança\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7804,23 -6277,19 +7820,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "no s'han trobat claus amb confiança absoluta\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7935,19 -6383,14 +7951,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7996,7 -6430,6 +8012,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error en crear «%s»: %s\n"
@@@ -8011,69 -6442,67 +8027,84 @@@ msgstr "no s'ha pogut emmagatzemar l'em
  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:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, 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:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, 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:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -8082,27 -6511,22 +8113,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "canvia la contrasenya"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "canvia la contrasenya"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -8110,118 -6534,94 +8141,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, 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:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "l'URI no és suportada"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -8243,57 -6640,45 +8274,57 @@@ msgstr "Introduïu el nom d'usuari: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOM|usa NOM com a destinatari predeterminat"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOM|usa NOM com a destinatari predeterminat"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "no usa el terminal en absolut"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "les ordres entren en conflicte\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8303,22 -6687,14 +8334,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -8337,12 -6710,10 +8363,12 @@@ msgstr "
  msgid "shell"
  msgstr "ajuda"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8355,12 -6724,10 +8381,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "no s'ha pogut obrir «%s»: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
@@@ -8388,9 -6750,6 +8414,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8413,12 -6768,10 +8439,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  #, fuzzy
  msgid "certificate not yet valid"
  msgstr "Certificat de revocació vàlid"
@@@ -8433,7 -6784,6 +8459,7 @@@ msgstr "Certificat de revocació vàlid
  msgid "intermediate certificate not yet valid"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "problema en la lectura del certificat: %s\n"
@@@ -8489,7 -6828,6 +8515,7 @@@ msgstr "Certificat de revocació vàlid
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Empremta digital:"
@@@ -8522,7 -6854,6 +8548,7 @@@ msgstr "Certificat correcte
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
@@@ -8534,31 -6864,25 +8560,31 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  #, fuzzy
  msgid "certificate chain too long\n"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  #, fuzzy
  msgid "issuer certificate not found"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifica una signatura"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "Certificat de revocació vàlid"
@@@ -8589,11 -6908,9 +8615,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "no"
@@@ -8640,36 -6952,28 +8666,36 @@@ msgstr "
  "«%2$.*1$s»\n"
  "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8763,72 -7049,58 +8789,72 @@@ msgstr "error en crear l'anell «%s»: 
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (només signar)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: error en llegir el registre lliure: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "desactiva una clau"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (signar i xifrar)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(No es va donar una descripció)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
@@@ -8838,83 -7110,66 +8864,83 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Adreça electrònica: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Introduïu el nou nom del fitxer"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr ""
  "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  #, fuzzy
  msgid "Enter URIs"
  msgstr "Introduïu el nom d'usuari: "
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "S'ha creat el certificat de revocació.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -9057,7 -7281,6 +9083,7 @@@ msgstr "afegeix aquest anell a la llist
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|usa aquest servidor per a cercar claus"
@@@ -9146,17 -7353,14 +9172,17 @@@ msgstr "Certificat correcte
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -9220,7 -7413,6 +9246,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9234,168 -7425,138 +9260,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "l'algoritme de protecció %d%s no està suportat\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Aquesta signatura va caducar el %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Signatura correcta de \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "              alias \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Açò serà una autosignatura.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "certificat duplicat: esborrat"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "certificat duplicat: esborrat"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "certificat duplicat: esborrat"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Empremta digital:"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "Certificat invàlid"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "error en la creació de la contrasenya: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "S'ha creat el certificat de revocació.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "Certificat de revocació vàlid"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "Certificat correcte"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "error en crear «%s»: %s\n"
@@@ -9432,7 -7587,6 +9463,7 @@@ msgstr "no s'ha pogut eliminar el bloc 
  msgid "not removing file '%s'\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -9658,7 -7768,6 +9689,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9675,13 -7782,11 +9706,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "la resposta de l'agent és invàlida\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9732,149 -7828,120 +9763,149 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "s'ha eliminat la verificació de signatura\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "no es pot crear el directori «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "no es pot crear el directori «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "lid ?: la inserció ha fallat: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "%s: error en escriure el registre de directoris: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: error en llegir el registre lliure: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "lid ?: la inserció ha fallat: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@@ -9883,50 -7949,38 +9914,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: error en escriure el registre de directoris: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@@ -10086,116 -8111,88 +10117,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Voleu eixir sense desar? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, 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:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10208,77 -8205,61 +10239,77 @@@ msgstr "
  "@\n"
  "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "forma d'ús: gpg [opcions] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "error de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
@@@ -10287,17 -8268,14 +10318,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:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forçat"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10538,38 -8468,31 +10569,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "s'està cercant «%s» al servidor HKP %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: la versió de fitxer %d és invàlida\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "no es pot obrir el fitxer: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "ha fallat l'actualització de la clau secreta: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10602,255 -8519,199 +10633,251 @@@ msgstr "error en la lectura de «%s»: 
  msgid "error building OCSP request: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "Certificat de revocació vàlid"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "Certificat correcte"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: no s'ha pogut accedir: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "no hi ha anell secret predeterminat: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "NOTA: aquesta clau ha estat revocada!"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "s'està comprovant la base de dades de confiança\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verifica una signatura"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "Certificat de revocació vàlid"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10947,193 -8787,146 +10974,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|usa el mode de contrasenya especificat"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOM|xifra per a NOM"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, 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:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, 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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "error de la xarxa"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "la contrasenya és errònia"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "no s'ha trobat la clau pública"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "error en la lectura de «%s»: %s\n"
diff --cc po/cs.po
index 553eeb9,487972b..5a41578
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -45,7 -44,6 +45,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@@ -56,45 -54,35 +56,45 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Zrušit"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Ano"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_Ne"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Uložit do správce hesel"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Opravdu chcete učinit heslo na obrazovce viditelným?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Zviditelnit heslo"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Skrýt heslo"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Kvalita:"
  
@@@ -104,73 -92,57 +104,73 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Kvalita textu zde zadaného.\n"
  "Na podrobnosti ohledně kritérií se zeptejte svého správce."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  "Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klíč"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
  "Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Heslo:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "neshodují se – zkuste to znovu"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (pokus %d z %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Znovu:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN je příliš dlouhý"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Heslo je příliš dlouhé"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Neplatný znak v PINu"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN je příliš krátký"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Špatný PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Špatné heslo"
  
@@@ -179,49 -150,35 +179,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "nelze otevřít „%s“: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "chyba při získání sériového čísla karty: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "nalezena karta se sériovým číslem: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "na kartě není autentizační klíč pro SSH: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "nenalezen žádný vhodný klíč karty: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "chyba při získání uložených příznaků: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -230,24 -187,19 +238,24 @@@ msgstr "
  "Proces SSH si vyžádal použití klíče%%0A  %s%%0A  (%s)%%0APřejete si to "
  "povolit?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Povolit"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Zakázat"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Prosím, vložte heslo pro SSH klíč%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Prosím, vložte toto heslo znovu"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -256,68 -208,53 +264,68 @@@ msgstr "
  "Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klíč%%0A   %s%%0A   %s"
  "%%0Auvnitř úložiště klíčů gpg-agenta"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "PIN správce"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Resetační kód"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0APro vstup použijte klávesnici čtečky."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Zopakujte resetační kód"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Zopakujte tento PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Zopakujte tento PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Resetační kód nebyl správně zopakován; zkuste to znovu"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK nebyl zopakován správně; zkuste to znovu"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN nebyl zopakován správně; zkuste to znovu"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "chyba při vytváření dočasného souboru: %s\n"
@@@ -400,47 -323,32 +408,47 @@@ msgstr "
  "@Volby:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "poběží v režimu serveru (na popředí)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, 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:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "vypisovat příkazy ve stylu sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "vypisovat příkazy ve stylu csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "neodpojovat se od konzole"
  
@@@ -517,11 -408,6 +525,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -539,43 -423,30 +547,43 @@@ 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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "zadána neplatná úroveň ladění „%s“\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "soubor s možnostmi „%s“: %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "čtou se možnosti z „%s“\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "socket nelze vytvořit: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "název socketu „%s“ je příliš dlouhý\n"
@@@ -584,29 -454,23 +592,29 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "chyba při získávání soli pro socket\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "volání listen() selhalo: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "naslouchá se na socketu „%s“\n"
@@@ -633,7 -491,6 +641,7 @@@ msgstr "volání stat() na „%s“ sel
  msgid "can't use '%s' as home directory\n"
  msgstr "„%s“ nelze použít jako domovský adresář\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
@@@ -658,12 -511,10 +666,12 @@@ msgstr "SSH obsluha 0x%lx pro fd %d spu
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s pozastaveno\n"
@@@ -685,8 -532,6 +693,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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -539,6 +702,9 @@@ msgstr "
  "@Příkazy:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -751,8 -585,6 +759,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
@@@ -812,8 -635,6 +820,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ano"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Ne"
  
@@@ -864,7 -678,6 +872,7 @@@ msgstr "Změnit heslo
  msgid "I'll change it later"
  msgstr "Změním jej později"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -872,11 -685,9 +880,11 @@@
  msgstr ""
  "Opravdu chcete smazat klíč určený pomocí keygripu%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Smazat klíč"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -898,7 -706,6 +906,7 @@@ msgstr "%s klíč používá nebezpečn
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zubitový hash není platný pro %ubitový %s klíč\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@@ -922,22 -725,14 +930,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "chyba při vytváření roury: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "chyba při vytváření proudu pro rouru: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "chyba při rozdvojování procesu: %s\n"
@@@ -952,8 -745,6 +960,8 @@@ msgstr "čekání na konec procesu %d s
  msgid "error running '%s': probably not installed\n"
  msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "chyba v běhu „%s“: návratový kód %d\n"
@@@ -963,13 -753,11 +971,13 @@@
  msgid "error running '%s': terminated\n"
  msgstr "chyba v běhu „%s“: násilně ukončeno\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "chyba při získání návratového kódu procesu %d: %s\n"
@@@ -1185,8 -927,6 +1193,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "nepodporovaný algoritmus: %s"
@@@ -1306,7 -1019,10 +1314,12 @@@ msgstr "ignoruji řádek s nepořádke
  msgid "[none]"
  msgstr "[neuvedeno]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "neplatný radix64 znak %02x byl přeskočen\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "argument nebyl očekáván"
  
@@@ -1373,7 -1075,6 +1386,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "nedostatek paměti\n"
  
@@@ -1432,8 -1122,6 +1445,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, 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"
@@@ -1599,8 -1254,6 +1612,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1260,9 +1621,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Váš výběr? "
  
@@@ -1677,16 -1310,10 +1690,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "chyba při čtení „%s“: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "chyba při zápisu do „%s“: %s\n"
@@@ -1746,7 -1360,6 +1759,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, 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 -1389,10 +1794,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
@@@ -1841,9 -1436,6 +1854,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Neplatný výběr.\n"
  
@@@ -1965,22 -1528,14 +1978,22 @@@ msgstr "Neplatný příkaz (zkuste „h
  msgid "--output doesn't work for this command\n"
  msgstr "--output pro tento příkaz není platný\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1584,6 +2054,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "chyba při vytváření hesla: %s\n"
@@@ -2077,7 -1613,6 +2090,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2199,37 -1710,28 +2212,37 @@@ msgstr "odstranit při exportu z klí�
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " – přeskočeno"
  
  # g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "zapisuje se do „%s“\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "klíč %s: tělo klíče je na kartě – přeskočeno\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "exportování tajného klíče není povoleno\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "klíč %s: PGP 2.x klíč – přeskočeno\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2502,7 -1943,6 +2515,7 @@@ msgstr "|N|nastavit úroveň komprese n
  msgid "use canonical text mode"
  msgstr "použít kanonický textový mód"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|SOUBOR|zapsat výstup do SOUBORU"
  
@@@ -2690,457 -2102,359 +2703,461 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "neznámá konfigurační položka „%s“\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "zobrazovat ID fotografií během výpisu klíčů"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "ukazovat URL politik během výpisu podpisů"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "ukazovat všechny poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  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:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  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:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "ukazovat název souboru s klíči při výpisu klíčů"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "ukazovat data expirace během výpisu podpisů"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "neznámá TOFU politika „%s“\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(možnosti lze vypsat příkazem „help“)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "„%s“ není platná doba expirace podpisu\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "neplatný režim pinentry „%s“\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "„%s“ není platná znaková sada\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "nelze zpracovat URL serveru klíčů\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: neplatný parametr pro import\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "neplatný parametr pro import\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: neplatný parametr pro export\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "neplatný parametr pro export\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "zobrazovat ID fotografií při ověřování podpisu"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "ukazovat URL politik při ověřování podpisu"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "ukazovat všechny poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  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:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  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:3239
++#: g10/gpg.c:3243
  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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "ověřovat podpisy s daty PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nelze nastavit exec-path na %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROVÁNÍ: %s přepíše %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Není dovoleno používat %s s %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nedává s %s smysl!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "vybraný kompresní algoritmus je neplatný\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  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:3731
++#: g10/gpg.c:3735
  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:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "neplatné implicitní předvolby\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "neplatné uživatelské předvolby pro šifrování\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "neplatné uživatelské předvolby pro hashování\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "neplatné uživatelské předvolby pro komprimaci\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s dosud není funkční s %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "nemohu inicializovat databázi důvěry: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export klíče se nepodařil: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dekódování z ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "kódování do ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "neplatný hashovací algoritmus „%s“\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, 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:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Začněte psát svou zprávu…\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "zadané URL pro certifikační politiku je neplatné\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "zadané URL pro podepisovací politiku je neplatné\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|SOUBOR|brát klíče z klíčenky (keyringu) SOUBOR"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  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:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|zapsat informace o stavu do tohoto FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4435,14 -3484,9 +4452,14 @@@ msgstr "
  "být nutně správné, dokud znova nespustíte program.\n"
  
  # status
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "odvolán"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "platnost skončila"
  
@@@ -4479,7 -3517,6 +4496,7 @@@ msgstr "Jste si jistý, že jej chcete 
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
  
@@@ -4512,7 -3543,6 +4529,7 @@@ msgstr[2] "Smazán %d podpis.\n
  msgid "Nothing deleted.\n"
  msgstr "Nic nebylo smazáno.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "neplatný"
  
@@@ -4743,71 -3725,55 +4760,71 @@@ msgstr "Podklíč %s je již revokován
  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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "duplicita předvolby „%s“\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "příliš mnoho předvoleb pro šifrování\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "příliš mnoho předvoleb pro vzorkování\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "příliš mnoho předvoleb pro komprimaci\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "zapisuji podpis klíče sebou samým\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "zapisuji „key-binding“ podpis\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "neplatná délka klíče; použiji %u bitů\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "délka klíče zaokrouhlena na %u bitů\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Podepisování"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certifikování"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Šifrování"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Autentizace"
  
@@@ -4821,150 -3787,119 +4838,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Pro klíč %s lze provést: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Aktuálně povolené akce: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost šifrovat\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Konec\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Prosím, vyberte druh klíče, který chcete:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA a RSA (implicitní)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA a Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC a ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (pouze pro podpis)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Existující klíč\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Vložte keygrip: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  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:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Klíč s takovým keygripem neexistuje\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Jakou délku klíče si přejete? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Požadovaná délka klíče je %u bitů.\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4980,7 -3915,6 +4997,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4996,38 -3930,30 +5013,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Klíč je platný pro? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Podpis je platný pro? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Platnost klíče nikdy neskončí\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Platnost podpisu nikdy neskončí\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Platnost klíče skončí v %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Platnost podpisu skončí v %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5035,11 -3961,9 +5052,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Je to správně (a/N)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5054,7 -3978,6 +5071,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5070,49 -3993,38 +5087,49 @@@ msgstr "
  "    „Magda Prochazkova (student) <magda at domena.cz>“\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Jméno a příjmení: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Neplatný znak ve jméně\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, 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:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Jméno nemůže začínat číslicí\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Komentář: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Neplatný znak v komentáři\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Používáte znakovou sadu „%s“.\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5123,7 -4035,6 +5140,7 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5138,33 -4049,26 +5155,33 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "jJkKeEPpUu"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Nejdřív, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5177,13 -4081,10 +5194,13 @@@ msgstr "
  "používat disky); díky tomu má generátor lepší šanci získat dostatek "
  "entropie.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Vytvoření klíče se nepodařilo: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5194,62 -4095,49 +5211,62 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Pokračovat (A/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Klíč pro „%s“ již existuje\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Přesto vytvořit? (a/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "přesto se vytváří\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, 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:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Vytváření klíče bylo zrušeno.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "veřejný klíč se zapisuje do „%s“\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  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"
@@@ -5257,7 -4145,6 +5274,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5265,7 -4152,6 +5282,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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5273,19 -4159,15 +5290,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Tajné části primárního klíče nejsou dostupné.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Opravdu vytvořit? (a/N) "
  
@@@ -5370,12 -4236,10 +5387,12 @@@ msgstr "          Otisk klíče =
  msgid "      Card serial no. ="
  msgstr "  Sériové číslo karty ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "zapamatovává se soubor klíčů „%s“\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5384,7 -4248,6 +5401,7 @@@ msgstr[0] "%lu klíčů již uloženo 
  msgstr[1] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
  msgstr[2] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "flush the cache"
  msgid "%lu key cached"
@@@ -5393,7 -4256,6 +5410,7 @@@ msgstr[0] "vyprázdní keš
  msgstr[1] "vyprázdní keš"
  msgstr[2] "vyprázdní keš"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5402,7 -4264,6 +5419,7 @@@ msgstr[0] "1 špatný podpis\n
  msgstr[1] "1 špatný podpis\n"
  msgstr[2] "1 špatný podpis\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: soubor klíčů (keyring) vytvořen\n"
@@@ -5705,7 -4504,6 +5722,7 @@@ msgstr "binární formát
  msgid "textmode"
  msgstr "textový formát"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "neznámý formát"
  
@@@ -5913,49 -4669,38 +5930,49 @@@ msgstr "VAROVÁNÍ: potencionálně neb
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "podpacket typu %d má nastavený kritický bit\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problém s agentem: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Vložit heslo\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "zrušeno uživatelem\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (hlavní ID klíče %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Prosím, zadejte heslo, abyste odemkli tajný klíč OpenPGP:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Prosím, zadejte heslo, abyste mohli importovat tajný klíč OpenPGP:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný podklíč OpenPGP:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč OpenPGP:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Opravdu chcete trvale smazat tajný klíč podklíče OpenPGP:"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Opravdu chcete trvale smazat tajný klíč OpenPGP:"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6384,17 -5046,14 +6401,17 @@@ msgstr "staré kódování DEK není po
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "šifrovací algoritmus %d%s je neznámý nebo je zneplatněn\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "VAROVÁNÍ: v předvolbách příjemce nenalezen šifrovací algoritmus %s\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "Poznámka: platnost tajného klíče %s skončila v %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "Poznámka: klíč byl odvolán"
  
@@@ -6713,7 -5323,6 +6730,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s podpis od: „%s“\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6721,11 -5330,9 +6738,11 @@@ msgstr "
  "VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
  "příjemce\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "podepisuji:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bude použito šifrování %s\n"
@@@ -6786,17 -5382,14 +6803,17 @@@ msgstr "neplatný otisk
  msgid "ownertrust value missing"
  msgstr "schází hodnota důvěryhodnosti vlastníka"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "chyba při hledání záznamu důvěryhodnosti v „%s“: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "chyba při čtení v „%s“: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "databáze důvěry: synchronizace selhala %s\n"
@@@ -6830,7 -5417,6 +6847,7 @@@ msgstr "transakce s databází důvěr
  msgid "%s: directory does not exist!\n"
  msgstr "%s: adresář neexistuje!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -6971,10 -5529,6 +6988,10 @@@ msgstr "chyba při vytváření dočasn
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7009,7 -5558,6 +7026,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7200,11 -5721,9 +7217,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7214,19 -5732,16 +7231,19 @@@
  msgid "resetting keydb: %s\n"
  msgstr "chyba při zápisu klíče: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %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:2794
++#: g10/tofu.c:2801
  #, 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"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
@@@ -7234,7 -5749,6 +7251,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
@@@ -7242,7 -5756,6 +7259,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
@@@ -7250,7 -5763,6 +7267,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
@@@ -7258,7 -5770,6 +7275,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
@@@ -7266,7 -5777,6 +7283,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
@@@ -7274,7 -5784,6 +7291,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
@@@ -7282,18 -5791,15 +7299,18 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Smazáno %d podpisů.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7302,13 -5808,11 +7319,13 @@@ msgstr[0] "vypsat hash zprávy
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "zašifrováno s heslem %lu\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7317,31 -5821,25 +7334,31 @@@ msgstr[0] "vypsat hash zprávy
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "platnost: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7359,19 -5857,15 +7376,19 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7420,50 -5905,40 +7437,50 @@@ msgstr "Databázi důvěry můžete zku
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "použití modelu důvěry %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "není nutné kontrolovat databázi důvěry\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "další kontrola databáze důvěry v %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "veřejný klíč %s nebyl nalezen: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "prosím proveďte --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontroluji databázi důvěry\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7472,7 -5947,6 +7489,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7481,16 -5955,13 +7498,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7498,7 -5969,6 +7515,7 @@@ msgstr "
  "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7610,19 -6059,14 +7627,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "funkce PIN callback skončila chybou: %s\n"
@@@ -7675,7 -6110,6 +7692,7 @@@ msgstr "
  "|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
  "kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 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"
@@@ -7690,70 -6122,70 +7707,87 @@@ msgstr "uložení otisku se nezdařilo
  msgid "failed to store the creation date: %s\n"
  msgstr "uložení data vytvoření se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "chyba při získání CHV z karty\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "odpověď neobsahuje RSA modulus\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "odpověď neobsahuje veřejný RSA exponent\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "odpověď neobsahuje veřejný klíč\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, 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:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "používám implicitní PIN jako %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, 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:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Prosím vložte PIN"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "ověření CHV%d se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "chyba při získání CHV z karty\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "karta je trvale uzamčena!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7767,25 -6199,19 +7801,24 @@@ msgstr[2] "
  "Do trvalého uzamčení karty zůstává %d pokusů o zadání PINu administrátora\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Prosím, zadejte PIN správce"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  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:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Prosím vložte PIN"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Prosím, zadejte resetační kód karty"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -7793,77 -6219,59 +7826,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nový resetační kód"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nový PIN správce"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Nový PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  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:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Prosím, zadejte PIN a nový PIN"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "chyba při čtení aplikačních dat\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "chyba při čtení otisku DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "klíč již existuje\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "existující klíč bude přepsán\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "generování nového klíče\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "nový klíč se zapisuje\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "chybí časové razítko vytvoření\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nelze uložit klíč: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "nepodporovaná křivka\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "prosím počkejte než bude klíč vygenerován…\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "generování klíče se nezdařilo\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7872,30 -6280,24 +7905,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "karta nepodporuje hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "dosud vytvořené podpisy: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@@ -7915,51 -6314,39 +7948,51 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|připojit se na čtečku na portu N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "NÁZEV|použít NÁZEV jako ovladač ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "NÁZEV|použít NÁZEV jako ovladač PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "nepoužívat vnitřní ovladač CCID"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|odpojovat se od karty po N sekundách nečinnosti"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "nepoužívat klávesnici čtečky"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "zakázat používání správcovských příkazů karty"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "používat vstup o proměnné délce na klávesnici čtečky"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7972,22 -6358,14 +8005,17 @@@ msgid "please use the option '--daemon
  msgstr ""
  "prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "obsluha pro deskriptor %d spuštěna\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "obsluha pro deskriptor %d ukončena\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "neplatný radix64 znak %02x byl přeskočen\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "v této relaci neběží žádný dirmngr\n"
  
@@@ -8004,12 -6379,10 +8032,12 @@@ msgstr "řetězený
  msgid "shell"
  msgstr "jednovrstvý"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "kritické rozšířené certifikátu %s není podporováno"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "certifikát vydavatele není označen jako CA"
  
@@@ -8022,11 -6393,9 +8050,11 @@@ msgstr "politika označená jako kritic
  msgid "failed to open '%s': %s\n"
  msgstr "„%s“ nebylo možné otevřít: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Poznámka: nekritické certifikační politiky nejsou dovoleny"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "certifikační politika není dovolena"
  
@@@ -8053,9 -6417,6 +8081,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8076,12 -6433,10 +8104,12 @@@ msgstr "prosím, ujistěte se, že „d
  msgid "checking the CRL failed: %s"
  msgstr "kontrola CRL se nezdařila: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikát s chybnou platností: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "certifikát ještě nenabyl platnosti"
  
@@@ -8093,7 -6446,6 +8121,7 @@@ msgstr "kořenový certifikát ještě 
  msgid "intermediate certificate not yet valid"
  msgstr "mezilehlý certifikát ještě nezačal platit"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "certifikátu vypršela platnost"
  
@@@ -8142,7 -6483,6 +8170,7 @@@ msgstr "  (   certifikát planý od 
  msgid "  (     issuer valid from "
  msgstr "  (   vydavatel platný od "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "otisk=%s\n"
@@@ -8171,7 -6505,6 +8199,7 @@@ msgstr "v certifikátu nebyl nalezen v
  msgid "self-signed certificate has a BAD signature"
  msgstr "certifikát podepsaný sám sebou má ŠPATNÝ podpis"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "kořenový certifikát není označen jako důvěryhodný"
  
@@@ -8180,28 -6512,22 +8208,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "řetěz certifikátů je příliš dlouhý\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "certifikát vydavatele nebyl nalezen"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "certifikát má ŠPATNÝ podpis"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "nalezen jiný možný odpovídající certifikát autority – zkusí se znovu"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "řetěz certifikátů je delší než dovoluje CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "certifikát je v pořádku\n"
  
@@@ -8227,7 -6548,6 +8255,7 @@@ msgstr "použit ověřovací model: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%ubitový hash není platná pro %ubitový %s klíč\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(toto je algoritmus MD2)\n"
  
@@@ -8235,7 -6555,6 +8263,7 @@@
  # none serial, none date
  # #-#-#-#-#  cs.po (dirmngr 1.0.3)  #-#-#-#-#
  # status
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "žádný"
  
@@@ -8269,36 -6583,28 +8297,36 @@@ msgstr "
  "sériové číslo %s, ID 0x%08lX,\n"
  "vytvořen %s, platnost vyprší %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "žádné použití klíče není určeno – předpokládají se všechna použití\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "chyba při zjišťování informací o použití klíče: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "certifikát neměl být použit pro certifikování\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "certifikát neměl být použit pro podepsání OCSP odpovědi\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "certifikát neměl použit pro šifrování\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "certifikát neměl být použit pro podepsání\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "certifikát není použitelný pro šifrování\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "certifikát není použitelný pro podepisování\n"
  
@@@ -8393,7 -6681,6 +8421,7 @@@ msgstr "řádek %d: chyba při získáv
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "řádek %d: generování klíče se nepodařilo: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8401,64 -6688,51 +8429,64 @@@ msgstr "
  "Žádost o certifikát dokončíte tím, že zadáte heslo pro klíč, který jste "
  "právě vytvořili, ještě jednou.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Existující klíč\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Klíč existující na kartě\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "chyba při čtení z karty: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Sériové číslo karty: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Dostupné klíče:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Možné způsoby užití %s klíče:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) podepisovat, šifrovat\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) podepisovat\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) šifrovat\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Zadejte X.509 jméno subjektu: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Nebylo zadáno Žádné jméno\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Neplatné jméno subjektu „%.*s“\n"
@@@ -8468,73 -6742,56 +8496,73 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Neplatné jméno subjektu „%s“\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "25 délka předešlého řetězce: see certreg-ui.c:gpgsm_gencertreq_tty"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Zadejte e-mailovou adresu"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (ukončete prázdným řádkem):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Zadejte DNS jména"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (volitelné; ukončete prázdným řádkem):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Zadejte (několik) URI"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Vytvořit sám sebou podepsaný certifikát? (a/N)"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Budou použity tyto parametry:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Nyní se vytváří sám sebou podepsaný certifikát. "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Nyní se vytváří žádost o certifikát. "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "To může chvíli trvat…\n"
  
  # Ready ve významu finished po vygenerování certifikátu
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Hotovo.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "Hotovo. Nyní byste měli tuto žádost poslat svojí CA.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "problém se zdroji: nedostatek paměti\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(toto je algoritmus RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(toto nevypadá jako zašifrovaná zpráva)\n"
  
@@@ -8667,7 -6893,6 +8695,7 @@@ msgstr "|SOUBOR|přidat klíčenku na s
  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:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|použít tento server pro dohledávání klíčů"
  
@@@ -8749,17 -6958,14 +8777,17 @@@ msgstr "chyba při ukládání certifik
  msgid "basic certificate checks failed - not imported\n"
  msgstr "základní kontrola certifikátu selhala – neimportováno\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "chyba při získání uložených příznaků: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "chyba při importování certifikátu: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "chyba při čtení vstupu: %s\n"
@@@ -8828,7 -7023,6 +8856,7 @@@ msgstr "
  "\n"
  "%s%sJste si skutečně jisti, že to chcete udělat?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8847,164 -7040,136 +8875,171 @@@ msgstr "
  "„%s“\n"
  "Vezměte na vědomí, že tento certifikát NEVYTVOŘÍ kvalifikovaný podpis!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "hashovací algoritmus %d (%s) podepisovatele %d není podporován; použiji %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "hashovací algoritmus použitý pro podepisovatele %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "kontrola kvalifikovaného certifikátu selhala: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Podpis vytvořen "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[datum neudáno]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " pomocí certifikátu s ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "neplatný podpis: atribut otisku zprávy se neshoduje s vypočteným otiskem\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Dobrý podpis od"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "          alias"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Toto je kvalifikovaný podpis\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "zámek keše certifikát nelze inicializovat: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "zámek pro čtení keše certifikátů nelze získat: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "zámek pro zápis keše certifikátů nelze získat: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "zámek keše certifikátů nelze uvolnit: %s\n"
  
  # TODO: plural
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "%u certifikátů bude z keše vyřazeno\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "certifikát „%s“ nelze rozebrat: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "certifikát „%s“ je již zapamatován\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "zaveden důvěryhodný certifikát „%s“\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "certifikát „%s“ zaveden\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "        otisk SHA1 = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "vydavatel ="
  
  # XXX: align with msgid "   issuer ="
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "  subjekt ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "chyba při zavádění certifikátu „%s“: %s\n"
  
  # XXX: Align with msgid "runtime cached certificates:"
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "   trvale zavedených certifikátů: %u\n"
  
  # XXX: Align with msgid "permanently loaded certificates:"
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "za běhu nakešovaných certifikátů: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
+ # XXX: Align with msgid "permanently loaded certificates:"
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "za běhu nakešovaných certifikátů: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "certifikát již v keši\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "certifikát uložen do keše\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "chyba při ukládání certifikátu do keše: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "neplatný řetězec otisku SHA1 „%s“\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "chyba při stahování certifikátu určeného sériovým číslem: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "chyba při stahovaní certifikátu určeného subjektem: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "v certifikátu nebyl nalezen vydavatel\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "chyba při zjišťování authorityKeyIdentifier: %s\n"
@@@ -9039,7 -7198,6 +9074,7 @@@ msgstr "odstraňuje se soubor keše „
  msgid "not removing file '%s'\n"
  msgstr "soubor „%s“ nebude neodstraněn\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "chyba při zavírání souboru keše: %s\n"
@@@ -9269,7 -7383,6 +9304,7 @@@ msgstr "sériové číslo %s je platné
  msgid "error getting data from cache file: %s\n"
  msgstr "chyba při získávání dat ze souboru keše: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "neznámý hašovací algoritmus „%s“\n"
@@@ -9283,12 -7394,10 +9318,12 @@@ msgstr "gcry_md_open selhalo na algorit
  msgid "got an invalid S-expression from libksba\n"
  msgstr "z libksba obdržen neplatný S-výraz\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "převod S-výrazu se nezdařil: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "výroba S-výrazu selhala: %s\n"
@@@ -9336,84 -7436,68 +9371,84 @@@ msgstr "certifikát vydavatele CRL bud
  msgid "CRL signature verification failed: %s\n"
  msgstr "ověřování podpisu CRL selhalo: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "chyba při kontrole platnosti certifikátu vydavatele CRL: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "volání ksba_crl_new selhalo: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "volání ksba_crl_set_reader selhalo: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "odstraněn zastaralý dočasný soubor keše „%s“\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "problém s odstraňováním zastaralého dočasného souboru keše „%s“: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "chyba při vytváření dočasného souboru keše „%s“: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "volání crl_parse_insert selhalo: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "chyba při dokončování dočasného souboru keše „%s“: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "chyba při uzavírání dočasného souboru keše „%s“: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "POZOR: nový CRL je stále příliš starý; jeho platnost vypršela %s – stejně "
  "bude nahrán\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "nový CRL je stále příliš starý; jeho platnost vypršela %s\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "neznámé kritické rozšíření CRL %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "chyba při čtení rozšíření CRL: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "vytváří se soubor keše „%s“\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "problém s přejmenováním „%s“ na „%s“: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9421,65 -7505,52 +9456,65 @@@ msgstr "
  "aktualizace souboru DIR selhalo – záznam keše bude při příštím startu "
  "programu ztracen\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "Zahajuje se výpis CRL (získán přes %s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  " CHYBA: CRL nebude použit, protože i po aktualizaci byl příliš starý!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr " CHYBA: CRL nebude použit kvůli neznámému kritickému rozšíření!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " CHYBA: CRL nebude použit\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr " CHYBA: Tento nakešovaný CRL byl možná pozměněn!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " POZOR: neplatná délka záznamu keše\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "problém se čtením záznamu keše: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "problém se čtením klíče keše: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "chyba při čtení položky keše z databáze: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Konec výpisu CRL\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "volání crl_fetch přes DP selhalo: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "volání crl_cache_insert přes DP selhalo: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@@ -9488,49 -7558,37 +9523,49 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "tabulka mapování čtenáře na soubor je plná – čeká se\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "namísto „https“ se použije „http“\n"
  
  # Poslední argument je název protokolu
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "chyba při inicializaci čtecího objektu: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "příliš mnoho přesměrování\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "chyba při získávání „%s“: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "chyba při získávání „%s“: status HTTP je %u\n"
  
  # Poslední argument je název protokolu
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "Přístup k CRL není možný kvůli režimu Tor\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "dohledání certifikátu nemožné kvůli vypnutému %s\n"
@@@ -9670,112 -7699,84 +9705,112 @@@ msgstr "očekáván absolutní název s
  msgid "looking up '%s'\n"
  msgstr "hledá se „%s“\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "vypíše obsah CRL keše"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|stáhne CRL z URL"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "vypne dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "vyprázdní keš"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "běží bez dotazování se uživatele"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "vynutí zavedení zastaralých CRL"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "povolí odesílání OCSP dotazů"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "zakáže použití HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "zakáže použití LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignoruje HTTP distribuční místa CRL "
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignoruje LDAP distribuční místa CRL"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|STROJ|pro LDAP dotazy použije STROJ"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "nepoužije náhradní stroje s --ldap-proxy"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|použije OCSP odpovídače na URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  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:223
++#: dirmngr/dirmngr.c:225
  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:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "směrovat veškerý síťový provoz skrz Tor"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9784,11 -7785,9 +9819,11 @@@ msgstr "
  "@\n"
  "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9796,78 -7795,61 +9831,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:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "platné úrovně ladění jsou: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "použití: %s [volby] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "stahování CRL z „%s“ selhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: chyba čtení: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, 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:1776
  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:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "přijat SIGTERM – vypíná se…\n"
  
  # TODO: plural
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "vypnutí vynuceno\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "přijat SIGINT – okamžité vypnutí\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -10097,35 -8031,28 +10132,35 @@@ msgstr "v názvu stroje je neplatný z
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "na seznam LDAP serverů se přidává „%s:%d“\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "funkce malloc selhala: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: chybný vzor „%s“\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search přesáhl omezení velikosti serveru\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "nalezen neplatný kanonický S-výraz\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "gcry_md_open selhalo: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "jejda: ksba_cert_hash selhalo: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "zjištěno chybné kódování URL\n"
  
@@@ -10157,244 -8078,188 +10192,240 @@@ msgstr "chyba při nastavování cíle 
  msgid "error building OCSP request: %s\n"
  msgstr "chyba při sestavování OCSP dotazu: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "chyba při připojování na „%s“: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "chyba při čtení HTTP odpovědi od „%s“: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "chyba přístupu k „%s“: status HTTP %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "chyba při rozebírání OCSP odpovědi od „%s“: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "Stav odpovídače OCSP na „%s“: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "hašování OCSP odpovědi pro „%s“ selhalo: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "v OCSP odpovědích je podporováno jen SHA-1\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "alokování prvku seznamu selhalo: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "chyba při zjišťování ID odpovídače: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "žádný vhodný certifikát pro ověření OCSP odpovědi nebyl nalezen\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "certifikát vydavatele nenalezen: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "volající nevrátil cílový certifikát\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "volající nevrátil vydávající certifikát\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "alokace OCSP kontextu selhala: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "authorityInfoAccess nelze získat: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "žádný výchozí OCSP odpovídač nedefinován\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "žádný výchozí OCSP podepisovatel nedefinován\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "použije se výchozí OCSP odpovídač „%s“\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "použije se OCSP odpovídač „%s“\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "nepodařilo se ustanovit hašovací kontext OCSP: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "chyba při zjišťování OCSP stavu cílového certifikátu: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "stav certifikátu je: %s (nyní=%s, příště=%s)\n"
  
  # status
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "dobrý"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "certifikát byl odvolán kdy: %s, důvod: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "OCSP odpovídač vrátil stav v budoucnosti\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "OCSP odpovídač vrátil ne současný stav\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP odpovídač vrátil příliš starý stav\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "volání assuan_inquire(%s) selhalo: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "chybí ldapserver (LDAP server)"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "v ID certifikátu chybí serialno (sériové číslo)"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "volání assuan_inquire selhalo: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "volání fetch_cert_by_url selhalo: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "volání start_cert_fetch selhalo: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "volání fetch_next_cert selhalo: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies (max. odpovědí) %d překročeno\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "řídící strukturu nelze alokovat: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "alokace kontextu assuan selhala: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "inicializace serveru selhala: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "registrace příkazu u Assuanu selhala: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problém příjmu Assuanu: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "zpracování Assuanu se nezdařilo: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr "kořenová CA, která není označena jako CA, bude přijata"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrola CRL se zanořila příliš hluboko\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "nekontroluje se CRL pro"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "kontroluje se CRL pro"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "sám sebou podepsaný certifikát má CHYBNÝ podpis"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "kontrola důvěryhodnosti kořenového certifikátu selhala: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "řetěz certifikátů je v pořádku\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA požaduje použití 160bitového hašovacího algoritmu\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  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"
  
@@@ -10489,197 -8333,150 +10520,197 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  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:723
- #: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Volby ovlivňující bezpečnost"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|zahazovat klíče SSH po N sekundách"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|nastavit maximální životnost dočasné paměti pro PINy na N sekund"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N| nastavit maximální životnost klíčů SSH na N sekund"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Volby vynucující politiku hesel"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "nedovolit obejít politiku hesel"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|nastavit minimální vyžadovanou délku nových hesel na N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|vyžaduje alespoň N nepísmenných znaků v novém hesle"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|omezit platnost hesla na N dnů"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "nedovolit opakovat stará hesla"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set LDAP timeout to N seconds"
  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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|nastavit e-mailový alias"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Nastavení serverů klíčů"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|používat server klíčů na URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "povolit dohledávání PKA (dotazy na DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "zakázat veškerý přístup k dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "neprověřovat kořenové certifikáty proti CRL"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Volby ovlivňující podobu výstupu"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Volby ovlivňující interaktivitu a vymáhání"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Volby ovlivňující použití Toru"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Nastavení HTTP serverů"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "používat systémové nastavení HTTP proxy"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Nastavení používaných LDAP serverů"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "Seznam LDAP serverů"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Nastavení OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG pro OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Démon pro čipové karty"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG pro S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "chyba sítě"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Zadávání kódu PIN a hesla"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Komponenta není vhodná pro spuštění"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Selhalo externí ověření komponenty %s"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error hashing '%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/da.po
index e70511c,0cd2a63..a0fa608
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -24,7 -23,6 +24,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@@ -35,47 -33,38 +35,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "_Afbryd"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Afbryd"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "Indtast ny adgangsfrase
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -93,7 -81,6 +93,7 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@@ -102,7 -89,6 +102,7 @@@
  "specialtegn. Spørg din administrator om mere præcis information om\n"
  "hvordan man anvender sikre adgangskoder."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -110,7 -96,6 +110,7 @@@ msgstr "
  "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
  "session"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -118,53 -103,40 +118,53 @@@ msgstr "
  "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
  "session"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Adgangsfrase:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "matcher ikke - prøv igen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (forsøg %d af %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN er for lang"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Adgangsfrase er for lang"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Ugyldige tegn i PIN"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN er for kort"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Ugyldig PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Ugyldig adgangsfrase"
  
@@@ -173,52 -144,38 +173,60 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "kan ikke åbne »%s«: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "detekteret kort med S/N: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "fejl ved indhentelse af standard-keyID for godkendelses af kort: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "ingen egnet kortnøgle fundet: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "fejl ved indhentelse af gemte flag: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -227,24 -184,19 +235,24 @@@ msgstr "
  "En ssh-proces anmodte om brugen af nøgle%%0A  %s%%0A  (%s)%%0AØnsker du at "
  "tillade dette"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Tillad"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Nægt"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Genindtast venligst denne adgangsfrase"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -253,68 -205,53 +261,68 @@@ msgstr "
  "Indtast venligst en adgangsfrase for at beskytte den modtaget hemmelige nøgle"
  "%%0A   %s%%0A   %s%%0Ainden i gpg-agentens nøglelager"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Indsæt venligst kortet med serielnummeret"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Administrator-PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Nulstillingskode"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Gentag denne nulstillingskode"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Gentag denne PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Gentag denne PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Nulstillingskode er ikke korrekt gentaget; prøv igen"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK er ikke korrekt gentaget; prøv igen"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN er ikke korrekt gentaget; prøv igen"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
@@@ -419,47 -342,32 +427,47 @@@ msgstr "
  "@Indstillinger:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "kør i servertilstand (forgrunden)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "kør i servertilstand"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "kommandoresultat i sh-stil"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "kommandoresultat i csh-stil"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "frakobl ikke fra konsollen"
  
@@@ -542,11 -433,6 +550,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
  
@@@ -568,48 -452,35 +576,48 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, 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:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan ikke oprette sokkel: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
@@@ -619,29 -489,23 +627,29 @@@ msgstr "sokkelnavnet »%s« er for lang
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "fejl ved indhentelse af nonce for soklen\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislykkedes: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
@@@ -673,7 -531,6 +681,7 @@@ msgstr "stat() mislykkedes for »%s«: 
  msgid "can't use '%s' as home directory\n"
  msgstr "kan ikke bruge »%s« som hjemmemappe\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fejl ved læsning af nonce på fd %d: %s\n"
@@@ -698,13 -551,11 +706,13 @@@ msgstr "ssh-håndtering 0x%lx for fd %
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh-håndtering 0x%lx for %d termineret\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
@@@ -726,8 -573,6 +734,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
  "Adgangskode for mellemlagervedligeholdelse\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -735,9 -580,6 +743,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -794,8 -628,6 +802,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -862,8 -685,6 +870,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nej"
  
@@@ -917,7 -731,6 +925,7 @@@ msgstr "Ændr adgangsfrasen
  msgid "I'll change it later"
  msgstr "Jeg ændrer den senere"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -925,13 -738,11 +933,13 @@@
  "%%0A?"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "aktiver nøgle"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -952,7 -760,6 +960,7 @@@ msgstr "%s-nøglen bruger en usikker (%
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@@ -979,23 -782,15 +987,23 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fejl ved forgrening af proces: %s\n"
@@@ -1011,8 -804,6 +1019,8 @@@ msgstr "ventning på at proces %d skull
  msgid "error running '%s': probably not installed\n"
  msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
@@@ -1024,13 -814,11 +1032,13 @@@ msgstr "fejl ved kørsel af »%s«: afs
  msgid "error running '%s': terminated\n"
  msgstr "fejl ved kørsel af »%s«: termineret\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
@@@ -1255,8 -997,6 +1263,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ikke understøttet algoritme: %s"
@@@ -1377,7 -1090,10 +1385,12 @@@ msgstr "ignorerer affaldslinje
  msgid "[none]"
  msgstr "[ingen]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "ugyldigt radix64-tegn %02x udeladt\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "parameter var ikke forventet"
  
@@@ -1446,7 -1148,6 +1459,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "uden for kerne\n"
  
@@@ -1509,8 -1199,6 +1522,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (kræver %s, har %s)\n"
@@@ -1677,8 -1332,6 +1690,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1338,9 +1699,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Dit valg? "
  
@@@ -1755,17 -1388,11 +1768,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "fejl ved læsning af »%s«: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
@@@ -1826,7 -1440,6 +1839,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
@@@ -1866,13 -1474,10 +1879,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "afrundet op til %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
@@@ -1933,9 -1528,6 +1946,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ugyldigt valg.\n"
  
@@@ -2063,23 -1626,15 +2076,23 @@@ msgstr "Ugyldig kommando (prøv »help�
  msgid "--output doesn't work for this command\n"
  msgstr "--output virker ikke for denne kommando\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1683,6 +2153,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
@@@ -2180,7 -1716,6 +2193,7 @@@ msgstr "
  "ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
  "præferencer\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2308,39 -1819,30 +2321,39 @@@ msgstr "fjern så meget som muligt fra 
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: udelod: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skriver til »%s«\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: intet blev eksporteret\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2615,7 -2056,6 +2628,7 @@@ msgstr "|N|sæt komprimeringsniveauet t
  msgid "use canonical text mode"
  msgstr "brug kanonisk teksttilstand"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv resultat til FIL"
  
@@@ -2816,469 -2228,371 +2829,473 @@@ msgstr "ADVARSEL: Usikkert indelukket m
  msgid "unknown configuration item '%s'\n"
  msgstr "ukendt konfigurationspunkt »%s«\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "vis billed-id'er under nøglevisninger"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "vil politikadresser under underskriftvisninger"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "vis alle notationer under underskriftvisninger"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotationer under underskriftvisninger"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brugerangivne notationer under underskriftvisninger"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "vis bruger-id-validitet under nøglevisninger"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "vis nøgleringsnavnet i nøglevisninger"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "vis udløbsdatoer under underskriftvisninger"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "ukendt tilvalg »%s«\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "kunne ikke fortolke nøgleserveradresse\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "vis billed-id'er under underskriftverificering"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "vis politikadresser under underskriftverificering"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "vis alle notationer under underskriftverificering"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotationer under underskriftverificering"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "vis brugerangivne notationer under underskriftverificering"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "vis bruger-id-validitet under underskriftverificering"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "vis kun den primære bruger-id i underskriftverificering"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "valider underskrifter med PKA-data"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "kunne ikke angive kørselssti til %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: program kan oprette en kernefil!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overskriver %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ikke tilladt med %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s er meningsløs sammen med %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kører med forfalsket systemtid: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt chifferalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valgt sammendragsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed skal være større end 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed skal være større end 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "ugyldige standardpræferencer\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldige præferencer for personlig chiffer\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldige præferencer for personlig sammendrag\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldige præferencer for personlig komprimering\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker endnu ikke med %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "kunne ikke initialisere TrustDB: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "nøgleserver send mislykkedes: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "nøgleserver modtag mislykkedes: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøgleeksport mislykkedes: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "nøgleserver søg mislykkedes: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "nøgleserver opdater mislykkedes: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "fjernelse af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "påklædning af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ugyldig hash-algoritme »%s«\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Gå til sagen og skriv meddelelsen ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|tag nøglerne fra nøgleringsFILEN"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "giv kun tidsstempelkonflikter en advarsel"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation til denne FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Brug: gpgv [tilvalg] [filer] (-h for hjælp)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4623,14 -3672,9 +4640,14 @@@ msgstr "
  "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
  "korrekt med mindre du genstarter programmet.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "tilbagekaldt"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "udløbet"
  
@@@ -4670,7 -3708,6 +4687,7 @@@ msgstr "Er du sikker på, at du stadig 
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
  
@@@ -4702,7 -3733,6 +4719,7 @@@ msgstr[1] "Slettede %d underskrift.\n
  msgid "Nothing deleted.\n"
  msgstr "Intet slettet.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "ugyldig"
  
@@@ -4945,73 -3927,57 +4962,73 @@@ msgstr "Undernøgle %s er allerede tilb
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "præference »%s« duplikeret\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "for mange chifferpræferencer\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "for mange sammendragpræferencer\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringspræferencer\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "skriver direkte underskrift\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "skriver egenunderskrift\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "skriver underskrift for nøglebinding\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøglestørrelse afrundet op til %u bit\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Underskriv"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certificer"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Krypter"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Godkend"
  
@@@ -5025,108 -3991,87 +5042,108 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "UuKkGfAa"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handligner for en %s-nøgle: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Aktuelt tilladte handlinger: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Skift evnen til at underskrive\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Skift evnen til at kryptere\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Skift evnen til at godkende\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Afsluttet\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (kun underskriv)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (kun krypter)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
@@@ -5135,51 -4080,41 +5152,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:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Indtst nøglegrebet: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøgle med dette nøglegreb\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Ønsket nøglestørrelse er %u bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5195,7 -4130,6 +5212,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5211,38 -4145,30 +5228,38 @@@ msgstr "
  "      <n>m = underskriften udløber om n måneder\n"
  "      <n>y = underskriften udløber om n år\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Nøgle er gyldig for? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Underskrift er gyldig for? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "ugyldig værdi\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Nøglen udløber aldrig\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Underskriften udløber aldrig\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøglen udløber den %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Underskriften udløber den %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5250,11 -4176,9 +5267,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt? (j/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5268,7 -4192,6 +5285,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5284,50 -4207,39 +5301,50 @@@ msgstr "
  "    »Heinrich Heine (digteren) <heinrichh at duesseldorf.de>«\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Fødselsnavn: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Ugyldige bogstaver i navn\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Navn må ikke starte med et tal\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navn skal være mindst 5 bogstaver langt\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-post-adresse: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Ikke en gyldig e-post-adresse\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Ugyldigt tegn i kommentar\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5338,7 -4250,6 +5355,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5353,35 -4264,28 +5370,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Ret venligst fejlen først\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5393,13 -4297,10 +5410,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøgleoprettelse mislykkedes: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5407,71 -4308,58 +5424,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, 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:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Brug denne nøgle alligevel? (j/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "opretter ny nøgle\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Nøgleoprettelse annulleret.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5479,7 -4367,6 +5496,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5487,7 -4374,6 +5504,7 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5495,22 -4381,18 +5512,22 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Vil du virkelig oprette? (j/N) "
  
@@@ -5591,13 -4457,11 +5608,13 @@@ msgstr "    Nøglefingeraftryk =
  msgid "      Card serial no. ="
  msgstr "   Serielnr. for kort ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "mellemlagrer nøglering »%s«\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5605,14 -4469,12 +5622,14 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
  msgstr[1] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5620,7 -4482,6 +5637,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 ugyldig underskrift\n"
  msgstr[1] "1 ugyldig underskrift\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: nøglering oprettet\n"
@@@ -5919,7 -4718,6 +5936,7 @@@ msgstr "binær
  msgid "textmode"
  msgstr "tekstilstand"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "ukendt"
  
@@@ -6143,25 -4899,20 +6160,25 @@@ msgstr "ADVARSEL: potentiel usikker sym
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "underpakke af typen %d har kritiske bitsæt\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problem med agenten: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Indtast adgangsfrase\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "afbrudt af bruger\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (hovednøgle-id %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
@@@ -6169,37 -4920,31 +6186,37 @@@ msgstr "
  "Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
  "objektet."
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6640,18 -5302,15 +6657,18 @@@ msgstr "gammel kodning for DEK'en er ik
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "chifferalgoritme %d%s er ukendt eller deaktiveret\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "ADVARSEL: chifferalgoritme %s ikke fundet i modtagerpræferencer\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "BEMÆRK: hemmelig nøgle %s udløb den %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6955,7 -5565,6 +6972,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s-underskrift fra: »%s«\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6963,11 -5572,9 +6980,11 @@@ msgstr "
  "ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
  "modtagerpræferencer\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "underskriver:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s-kryptering vil blive brugt\n"
@@@ -7027,19 -5623,16 +7044,19 @@@ msgstr "ugyldig fingeraftryk
  msgid "ownertrust value missing"
  msgstr "værdi for ejertroværdighed mangler"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "fejl under forsøg på at finde troværdighedspost i »%s«: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "læsefejl i »%s«: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronisering mislykkedes: %s\n"
@@@ -7075,7 -5662,6 +7092,7 @@@ msgstr "transaktion for trustdb er for 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: mappe findes ikke!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7219,10 -5777,6 +7236,10 @@@ msgstr "fejl ved oprettelse af midlerti
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7257,7 -5806,6 +7274,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fejl ved åbning af »%s«: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7436,11 -5957,9 +7453,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7450,79 -5968,67 +7467,79 @@@
  msgid "resetting keydb: %s\n"
  msgstr "fejl ved skrivning af nøgle: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "fejl ved lagring af flag: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Slettede %d underskrifter.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7530,13 -6036,11 +7547,13 @@@ msgid_plural "%s: Verified %ld~signatur
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "krypteret med %lu adgangsfraser\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7544,31 -6048,25 +7561,31 @@@ msgid_plural "Encrypted %ld~messages i
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "validitet: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7585,19 -6083,15 +7602,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7647,54 -6132,44 +7664,54 @@@ msgstr "Du kan forsøge at genskabe tru
  msgid "If that does not work, please consult the manual\n"
  msgstr "Hvis det ikke virker, så se venligst manualen\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruger %s troværdighedsmodel\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "intet behov for kontrol af trustdb\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "næste kontrol af trustdb sker den %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "udfør venligst en --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7702,7 -6177,6 +7719,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "     %lu-nøgler behandlet\n"
  msgstr[1] "     %lu-nøgler behandlet\n"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7710,16 -6184,13 +7727,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "ingen ultimativ troværdige nøgler fundet\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7727,7 -6198,6 +7744,7 @@@ msgstr "
  "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -7840,19 -6289,14 +7857,19 @@@ msgstr "
  "Syntaks: kbxutil [tilvalg] [filer]\n"
  "Vis, eksporter, importer Keybox-data\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@@ -7906,7 -6341,6 +7923,7 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
@@@ -7921,70 -6353,70 +7938,87 @@@ msgstr "kunne ikke gemme fingeraftrykke
  msgid "failed to store the creation date: %s\n"
  msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "fejl ved indhentelse af CHV-status fra kort\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar indeholder ikke RSA modulus'erne\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "svar indeholder ikke data for offentlig nøgle\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruger standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Indtast venligst PIN%%0A[sigs færdig: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Indtast venligst PIN'en"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "verificering af CHV%d mislykkedes: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "fejl ved indhentelse af CHV-status fra kort\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "kort er permanent låst!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7994,25 -6426,19 +8028,24 @@@ msgstr[0] "%d PIN-forsøg for administr
  msgstr[1] "%d PIN-forsøg for administrator før kort permanent låses\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Indtast venligst administrator-PIN'en"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Indtast venligst PIN'en"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Indtast venligst nulstillingskoden for kortet"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@@ -8020,79 -6446,61 +8053,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nulstillingskode"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny administrator-PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Indtast venligst PIN'en og ny PIN"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "fejl ved læsning af programdata\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "fejl ved læsning af fingeraftryk DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "nøgle findes allerede\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "eksisterende nøgle vil blive erstattet\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "opretter ny nøgle\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "skriver ny nøgle\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "oprettelsestidsstempel mangler\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "kunne ikke gemme nøglen: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "ikke understøttet algoritme: %s"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "vent venligst mens nøglen bliver oprettet ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "oprettelse af nøgle mislykkedes\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8100,32 -6508,26 +8133,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "underskrifter oprettet indtil videre: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@@ -8145,53 -6544,41 +8178,53 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|skriv en log til FIL"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|forbind til læser på port N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAME|brug NAVN som ct-API-driver"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|brug NAVN som PC/SC-driver"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "brug ikke den interne CCID-driver"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|frakobl kortet efter N sekunder inaktivitet"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "brug ikke en læsers numeriske tastatur"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "nægt brugen af kommandoer for administratorkort"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, 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:288
++#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8211,22 -6597,14 +8244,17 @@@ msgid "please use the option '--daemon
  msgstr ""
  "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "håndtering for fd %d startet\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "håndtering for fd %d termineret\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "ugyldigt radix64-tegn %02x udeladt\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8245,12 -6620,10 +8273,12 @@@ msgstr "kæde
  msgid "shell"
  msgstr "skal"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "kritisk certifikatudvidelse %s er ikke understøttet"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "udstedercertifikat er ikke markeret som en CA"
  
@@@ -8264,13 -6635,11 +8292,13 @@@ msgstr "kritisk markeret politik uden k
  msgid "failed to open '%s': %s\n"
  msgstr "kan ikke åbne »%s«: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "bemærk: ikkekritisk certifikatpolitik er ikke tilladt"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "certifikatpolitik er ikke tilladt"
  
@@@ -8297,9 -6661,6 +8325,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8320,12 -6677,10 +8348,12 @@@ msgstr "sikr dig at »dirmngr« er korr
  msgid "checking the CRL failed: %s"
  msgstr "kontrol af CRL'en mislykkedes: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikat med ugyldig validitet: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "certifikat er endnu ikke gyldigt"
  
@@@ -8337,7 -6690,6 +8365,7 @@@ msgstr "rodcertifikat er endnu ikke gyl
  msgid "intermediate certificate not yet valid"
  msgstr "mellemliggende certifikat er endnu ikke gyldigt"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "certifikat er udløbet"
  
@@@ -8387,7 -6728,6 +8415,7 @@@ msgstr "  (certifikat gyldigt fra 
  msgid "  (     issuer valid from "
  msgstr "  (   udsteder gyldig fra "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeraftryk=%s\n"
@@@ -8418,7 -6752,6 +8446,7 @@@ msgstr "ingen udsteder fundet i certifi
  msgid "self-signed certificate has a BAD signature"
  msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "rodcertifikat er ikke markeret som troværdig"
  
@@@ -8427,28 -6759,22 +8455,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "certifikatkæde er for lang\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "udstedercertifikat blev ikke fundet"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "certifikat har en UGYLDIG underskrift"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "certifikatkæde er længere end tilladt af CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "certifikat er gyldigt\n"
  
@@@ -8474,11 -6795,9 +8502,11 @@@ msgstr "valideringsmodel brugt: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(dette er MD2-algoritmen)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "ingen"
  
@@@ -8513,36 -6827,28 +8541,36 @@@ msgstr "
  "S/N %s, id 0x%08lX,\n"
  "oprettet %s, udløber %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "certifikat burde ikke være brugt for certificering\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "certifikat burde ikke være brugt for kryptering\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "certifikat burde ikke være brugt for underskrift\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "certifikat kan ikke bruges til kryptering\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "certifikat kan ikke bruges til underskrivning\n"
  
@@@ -8649,7 -6937,6 +8677,7 @@@ msgstr "linje %d: fejl ved indhentelse 
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "linje %d: nøgleoprettelse mislykkedes: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8657,64 -6944,51 +8685,64 @@@ msgstr "
  "For at færdiggøre denne certifikatanmodning så indtast venligst "
  "adgangsfrasen for nøglen du netop oprettede endnu en gang.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Eksisterende nøgle\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Eksisterende nøgle fra kort\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "fejl ved læsning af kort: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Serielnummer for kortet: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Tilgængelige nøgler:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Mulige handlinger for en %s-nøgle:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) underskriv, krypter\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) underskriv\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) krypter\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Indtast X.509-emnenavnet: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Intet emnenavn angivet\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8725,79 -6999,62 +8753,79 @@@ msgstr "Ugyldig etiket for emnenavn »%
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
  msgstr "Ugyldigt emnenavn »%s«\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "19"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Indtast e-post-adresse"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (slut med en tom linje):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Indtast DNS-navne"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (valgfrit; slut med en tom linje):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Indtast URI'er"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
  msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
  msgstr "Opretter certifikatforespørgsel. Dette kan tage et stykke tid ...\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "Klar. Du skal nu sende denne forespørgsel til din CA.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "ressourceproblem: ikke nok kerne\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(dette er RC2-algoritmen)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dette ser ikke ud til at være en krypteret besked)\n"
  
@@@ -8933,7 -7159,6 +8961,7 @@@ msgstr "|FILE|tilføj nøglering til n�
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
  
@@@ -9026,17 -7235,14 +9054,17 @@@ msgstr "fejl ved lagring af certifikat\
  msgid "basic certificate checks failed - not imported\n"
  msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "fejl ved indhentelse af gemte flag: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "fejl under import af certifikat: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "fejl ved læsning af inddata: %s\n"
@@@ -9107,7 -7302,6 +9135,7 @@@ msgstr "
  "\n"
  "%s%sEr du sikker på, at det er hvad du ønsker?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9126,182 -7319,153 +9154,188 @@@ msgstr "
  "»%s«\n"
  "Bemærk, at dette certifikat IKKE vil oprette en kvalificeret underskrift!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "hashalgoritme %d (%s) for underskriver %d er ikke understøttet; bruger %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "hashalgoritme brugt for underskriver %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Underskrift lavet "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[dato ikke angivet]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " bruger certifikat-id 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "ugyldig underskrift: attribut for beskedsammendag matcher ikke den "
  "beregnede\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "God underskrift fra"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "     også kendt som"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Dette er en kvalificeret underskrift\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "problem under udkig efter eksisterende certifikat: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
  msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "kan ikke oprette »%s«: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
  msgstr "certifikat »%s« slettet\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
  msgstr "duplikeret certifikat »%s« slettet\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
  msgstr "certifikat »%s« slettet\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "fingeraftryk=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
  msgstr "Inkluderede certifikater"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
  msgstr "antallet af matchende certifikater: %d\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "number of matching certificates: %d\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "antallet af matchende certifikater: %d\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
  msgstr "  (certifkat oprettet den "
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate cached\n"
  msgstr "certifikat er gyldigt\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "ugyldig fingeraftryk"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
  msgstr "ingen udsteder fundet i certifikat"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9343,7 -7501,6 +9377,7 @@@ msgstr "modtagelse af linje mislykkedes
  msgid "not removing file '%s'\n"
  msgstr "påklædning af panser mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9588,7 -7701,6 +9622,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "fejl ved indhentelse af gemte flag: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9603,13 -7713,11 +9637,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "iconv_open mislykkedes: %s:\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9664,164 -7763,135 +9698,164 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "underskriftverificering undertrykt\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "læsning mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "opdatering af hemmelighed mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "fejl ved skrivning til midlertidig fil: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
  msgstr "fejl ved læsning af inddata: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid notation data found\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "ADVARSEL: Ingen notationsdata fundet\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
  msgstr "fejl ved læsning af kort: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "problem under gensøgning af certifikat: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
  msgstr "fejl ved læsning af nonce på fd %d: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "læsning mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9831,54 -7900,42 +9865,54 @@@ msgstr "modtagelse af linje mislykkedes
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: fejl ved skrivning af mappepost: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "for mange chifferpræferencer\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
  msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
  msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "certifikat »%s« blev ikke fundet: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate search not possible due to disabled %s\n"
@@@ -10044,126 -8072,98 +10078,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, 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:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "send en kommando til dirmngr'en"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|skriv servertilstandslogge til FIL"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Afslut uden at gemme? (j/N) "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillad PKA-opslag (DNS-forespørgsler)"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, 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:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10176,13 -8176,11 +10210,13 @@@ msgstr "
  "@\n"
  "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, 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:363
++#: dirmngr/dirmngr.c:383
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10194,88 -8192,71 +10228,88 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, 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:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "brug: gpgsm [tilvalg] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ugyldig fingeraftryk"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "ikke tvunget"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10531,40 -8464,33 +10565,40 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "sender nøgle %s til %s server %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: ugyldig filversion %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
  msgstr "iconv_open mislykkedes: %s:\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "opdatering af hemmelighed mislykkedes: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10602,287 -8522,231 +10636,283 @@@ msgstr "fejl ved lagring af flag: %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "fejl ved læsning af »%s«: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
  msgstr "fejl ved skrivning til »%s«: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "fejl ved læsning fra %s: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
  msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "fejl ved binding af sokkel til »%s«: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
  msgstr "modtagelse af linje mislykkedes: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  #, fuzzy
  #| msgid "certificate should not have been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
  msgstr "udstedercertifikat blev ikke fundet"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
  msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
  msgstr "fejl ved lagring af certifikat\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "kunne ikke allokere keyDB-håndtag\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "kan ikke tilgå »%s«: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "ingen hemmelig standardnøglering: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
  msgstr "bruger standard-PIN som %s\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "bruger chiffer %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "certifikat er blevet tilbagekaldt"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "afsendelse af linje mislykkedes: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "afsendelse af linje mislykkedes: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "underskrift mislykkedes: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
  msgstr "udstedercertifikat er ikke markeret som en CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrollerer trustdb\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
  msgstr "kontrol af CRL'en mislykkedes: %s"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
  msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
  msgstr "certifikat er gyldigt\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  #, fuzzy
  #| msgid "certificate should not have been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
@@@ -10990,193 -8833,146 +11020,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Tilvalg der kontrollerer konfigurationen"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Tilvalg der kontrollerer sikkerheden"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|udløb SSH-nøgler efter N sekunder"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|kræv mindst N ikkealfanumeriske tegn for en ny adgangsfrase"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|giv adgangsfrasen udløb efter N dage"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "tillad ikke genbrug af gamle adgangsfraser"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|krypter også til bruger-id-NAVN"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|opsæt e-post-aliasser"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration for nøgleservere"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillad PKA-opslag (DNS-forespørgsler)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "deaktiver al adgang til dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "kontroller ikke CRL'er for rodcertifikater"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Tilvalg der kontrollerer formatet for resultatet"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Tilvalg der kontrollerer sikkerheden"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration for HTTP-servere"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "brug systemets HTTP-proxyopsætning"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguraiton af LDAP-servere der skal bruges"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAP-serverliste"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Konfiguration for OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Ugyldig adgangsfrase"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponent blev ikke fundet"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern verifikation af komponent %s mislykkedes"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Bemærk at gruppespecifikationer ignoreres\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/de.po
index 4961335,165dade..5a1d934
--- 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: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2017-01-23 19:23+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
+ "PO-Revision-Date: 2017-02-22 18:55+0100\n"
  "Last-Translator: Werner Koch <wk at gnupg.org>\n"
  "Language-Team: German <de at li.org>\n"
  "Language: de\n"
@@@ -19,7 -18,6 +19,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@@ -30,47 -28,37 +30,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "_Abbrechen"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "_Ja"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "_Nein"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "Im Passwordmanager _speichern"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr ""
  "Möchten Sie die eingegebene Passphrase wirklich auf dem Bildschirm sichtbar "
  "machen?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "Die Passphrase sichtbar machen"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "Passphrase unsichtbar machen"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Qualität:"
  
@@@ -80,14 -68,12 +80,14 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
  "Bitte fragen sie Ihren Systembeauftragten nach den\n"
  "Kriterien für die Messung der Qualität."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -95,7 -81,6 +95,7 @@@ msgstr "
  "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
  "kann"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
  "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
  "werden kann."
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: 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
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (Versuch %d von %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Nochmal:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "Die PIN ist zu lang"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Das Mantra (Passphrase) ist zu lang!"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Ungültige Zeichen in der PIN!"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "Die PIN ist zu kurz!"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Falsche PIN!"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Falsche Passphrase!"
  
@@@ -158,49 -129,34 +158,56 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s' kann nicht geöffnet werden: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "Erkannte Karte hat die Seriennummer: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "Auf der Karte ist kein Authentisierungsschlüssel für SSH: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "keine passender Kartenschlüssel gefunden: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "Fehler beim Holen der Liste der Karten: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -209,26 -165,21 +216,26 @@@ msgstr "
  "Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
  "(%s)%%0AErlauben Sie dies?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Erlauben"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Verweigern"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr ""
  "Bitte geben Sie die Passphrase für den SSH-Schlüssel%%0A  %F%%0A  "
  "(%c)%%0Aein."
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -238,70 -189,55 +245,70 @@@ msgstr "
  "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
  "schützen."
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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 "
  "Seriennummer ein:"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Admin-PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Rückstellcode"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AZur Eingabe die Tastatur des Kartenlesers verwenden."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Rückstellcode bitte wiederholen"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "PUK bitte wiederholen"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "PIN bitte wiederholen"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Bitte geben Sie die PIN%s%s%s ein, um die Karte zu entsperren"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
@@@ -389,45 -311,30 +396,45 @@@ msgstr "
  "@Optionen:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "Im Daemon Modus ausführen"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "Im Server Modus ausführen"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  msgid "run in supervised mode"
  msgstr "Im \"Supervised\" Modus ausführen"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "Ausgabe für /bin/sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "Ausgabe für /bin/csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "Im Vordergrund laufen lassen"
  
@@@ -502,11 -392,6 +509,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -524,43 -407,30 +531,43 @@@ 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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "ungültige Debugebene `%s' angegeben\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "Optionendatei '%s': %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "Optionen werden aus '%s' gelesen\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "Socket kann nicht erzeugt werden: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Der Name des Sockets `%s' ist zu lang\n"
@@@ -569,27 -438,21 +576,27 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "Es wird auf Socket `%s' gehört\n"
@@@ -616,7 -473,6 +623,7 @@@ msgstr "stat()-Aufruf für `%s' fehlges
  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:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
@@@ -641,12 -493,10 +648,12 @@@ msgstr "SSH-Handhabungsroutine 0x%lx f�
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s angehalten\n"
@@@ -668,8 -514,6 +675,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
  "Kennwortpuffer-Pflege\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -677,9 -521,6 +684,9 @@@ msgstr "
  "@Befehle:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -735,8 -568,6 +742,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -800,8 -622,6 +807,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nein"
  
@@@ -857,7 -670,6 +864,7 @@@ msgstr "Die Passphrase ändern
  msgid "I'll change it later"
  msgstr "Ich werde sie später ändern"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -866,11 -678,9 +873,11 @@@ msgstr "
  "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A  %s%%0A  %%C%%0Awirklich "
  "entfernen?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Schlüssel löschen"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -894,7 -701,6 +901,7 @@@ msgid "a %zu bit hash is not valid for 
  msgstr ""
  "Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@@ -918,22 -720,14 +925,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@@ -948,8 -740,6 +955,8 @@@ msgstr "Das Warten auf die Beendigung d
  msgid "error running '%s': probably not installed\n"
  msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
@@@ -959,12 -748,10 +966,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "Fehler bei Ausführung von `%s': beendet\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
@@@ -1178,8 -919,6 +1185,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "Nicht unterstütztes Verfahren: %s"
@@@ -1299,7 -1011,10 +1306,12 @@@ msgstr "Zeile mit nicht identifizierte
  msgid "[none]"
  msgstr "[keine]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "Argument nicht erwartet"
  
@@@ -1365,7 -1066,6 +1377,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "Nicht genügend Speicher\n"
  
@@@ -1423,8 -1112,6 +1435,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, 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"
@@@ -1581,8 -1235,6 +1593,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1241,9 +1602,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Ihre Auswahl? "
  
@@@ -1660,16 -1292,10 +1672,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "Fehler beim Lesen von `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "Fehler beim Schreiben von %s: %s\n"
@@@ -1729,7 -1342,6 +1741,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
@@@ -1767,13 -1374,10 +1779,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "aufgerundet auf %u Bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
@@@ -1830,9 -1424,6 +1842,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ungültige Auswahl.\n"
  
@@@ -1955,22 -1517,14 +1967,22 @@@ msgstr "Ungültiger Befehl (versuchen S
  msgid "--output doesn't work for this command\n"
  msgstr "--output funktioniert nicht bei diesem Befehl\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1572,6 +2042,7 @@@ msgstr "
  "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
  "entfernen.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@@ -2069,7 -1604,6 +2081,7 @@@ msgstr "
  "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
  "%s (%d) verletzt die Empfängervoreinstellungen\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2195,36 -1705,27 +2207,36 @@@ msgstr "Während des Exports soviel wi
  msgid "use the GnuPG key backup format"
  msgstr "Das GnuPG Datensicherungsformat für Schlüssel benutzen"
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " - übersprungen"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "Schreiben nach '%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "WARNUNG: Nichts exportiert\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2483,7 -1923,6 +2495,7 @@@ msgstr "|N|Kompressionsstufe auf N setz
  msgid "use canonical text mode"
  msgstr "Textmodus benutzen"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|DATEI|Ausgabe auf DATEI schreiben"
  
@@@ -2658,459 -2069,362 +2670,464 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "Unbekanntes Konfigurationselement `%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "Richtlinien-URL mit den Signaturen anlisten"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "Alle Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "Standard Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "Benutzer-Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "Das Ablaufdatum mit den Signaturen anlisten"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, c-format
  msgid "valid values for option '%s':\n"
  msgstr "Gültige Argumente für Option '%s':\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "Unbekannte TOFU Regel '%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "Ungültiges Argument für Option '%s'\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "Ungültiger Subjekt-Name '%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "`%s' ist kein gültiger Zeichensatz\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "Ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ungültige Import-Option\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "Ungültige Import-Option\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "Ungültige Filter-Option: %s\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ungültige Export-Option.\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "Ungültige Export-Option\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ungültige Listen-Option.\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "Ungültige Listen-Option\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "Foto-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "Alle Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  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:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  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:3239
++#: g10/gpg.c:3243
  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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  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:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "Ungültige Überprüfungs-Option\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "WARNUNG: %s ersetzt %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed müssen größer als 0 sein\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed müssen größer als 1 sein\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "ungültige Standard-Voreinstellungen\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "ungültige private Hashvoreinstellungen\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "ungültige private Komprimierungsvoreinstellungen\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s arbeitet noch nicht mit %s zusammen\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Schlüsselexport fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "Ungültiges Hashverfahren '%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, 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:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ "WARNING:  Kein Kommando angegeben.  Versuche zu raten was gemeint ist ...\n"
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Auf geht's - Botschaft eintippen ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "differierende Zeitangaben sind kein Fehler"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|Weise mit ALGO erstellte Signaturen zurück"
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h für Hilfe)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4415,14 -3464,9 +4432,14 @@@ msgstr "
  "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
  "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "widerrufen"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "verfallen"
  
@@@ -4461,7 -3499,6 +4478,7 @@@ msgstr "Wollen Sie ihn immer noch hinzu
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  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"
  
@@@ -4492,7 -3523,6 +4509,7 @@@ msgstr[1] "%d Beglaubigungen entfernt.\
  msgid "Nothing deleted.\n"
  msgstr "Nichts entfernt.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "ungültig"
  
@@@ -4733,71 -3715,55 +4750,71 @@@ msgstr "Unterschlüssel %s ist bereits 
  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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "Voreinstellung `%s' ist doppelt\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "zu viele Verschlüsselungeinstellungen\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "zu viele Hashvoreinstellungen\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "zu viele Komprimierungsvoreinstellungen\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "Die Eigenbeglaubigung wird geschrieben\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "Schreiben der \"key-binding\" Signatur\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Signieren"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Zertif."
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Verschl."
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Authentisierung"
  
@@@ -4811,150 -3777,119 +4828,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsVvAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Derzeit erlaubte Vorgänge: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Umschalten der Signaturnutzbarkeit\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Umschalten der Authentisierungsnutzbarkeit\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Beenden\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA und RSA (voreingestellt)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA und Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (Nutzung selber einstellbar)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (Nutzung selber einstellbar)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) ECC und ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (nur signieren)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (Nutzung selber einstellbar)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Vorhandener Schlüssel\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Geben Sie den \"Keygrip\" ein: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "gerundet auf %u Bit\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4970,7 -3905,6 +4987,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4986,38 -3920,30 +5003,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "Ungültiger Wert.\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Schlüssel verfällt nie\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Signature verfällt nie\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Key verfällt am %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signatur verfällt am %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5025,11 -3951,9 +5042,11 @@@ msgstr "
  "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
  "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Ist dies richtig? (j/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5043,7 -3967,6 +5060,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5059,49 -3982,38 +5076,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Ihr Name (\"Vorname Nachname\"): "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Ungültiges Zeichen im Namen\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, 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:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Email-Adresse: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Diese Email-Adresse ist ungültig\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Ungültiges Zeichen im Kommentar.\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Sie benutzen den Zeichensatz `%s'\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5112,7 -4024,6 +5129,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5127,31 -4038,24 +5144,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeFfAa"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5162,13 -4066,10 +5179,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5179,62 -4080,49 +5196,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Fortsetzen? (J/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Trotzdem erzeugen? (j/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "wird trotzdem erzeugt\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, 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:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Schlüsselerzeugung abgebrochen.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5243,7 -4131,6 +5260,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5251,7 -4138,6 +5268,7 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
  "stimmen nicht überein)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5259,19 -4145,15 +5276,19 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
  "Uhren stimmen nicht überein)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Wirklich erzeugen? (j/N) "
  
@@@ -5350,33 -4216,28 +5367,33 @@@ msgstr "  Schl.-Fingerabdruck =
  msgid "      Card serial no. ="
  msgstr "      Kartenseriennr. ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "Puffern des Schlüsselbundes `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu Schlüssel bislang gepuffert (%lu Beglaubigung)\n"
  msgstr[1] "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] "%lu Schlüssel gepuffert"
  msgstr[1] "%lu Schlüssel gepuffert"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
  msgstr[0] " (%lu Beglaubigung)\n"
  msgstr[1] " (%lu Beglaubigungen)\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: Schlüsselbund erstellt\n"
@@@ -5673,7 -4472,6 +5690,7 @@@ msgstr "Binäre
  msgid "textmode"
  msgstr "Textmodus"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "unbekannt"
  
@@@ -5890,61 -4646,50 +5907,61 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "Problem mit dem Agenten: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Geben Sie die Passphrase ein\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "Abbruch durch Benutzer\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (Hauptschlüssel-ID %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr ""
  "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
  "entsperren:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr ""
  "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
  "importieren:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr ""
  "Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
  "exportieren:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr ""
  "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
  "exportieren:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr ""
  "Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
  "dauerhaft entfernen? (j/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr ""
  "Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
  "entfernen? (j/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6382,19 -5044,16 +6399,19 @@@ msgstr "alte Kodierung des DEK wird nic
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "WARNUNG: Das Verschlüsselungsverfahren %s wurde nicht in den "
  "Empfängereinstellungen gefunden\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "Hinweis: Schlüssel wurde widerrufen"
  
@@@ -6705,7 -5315,6 +6722,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s Signatur von: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6713,11 -5322,9 +6730,11 @@@ msgstr "
  "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
  "Empfängervoreinstellungen\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "signiere:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s Verschlüsselung wird verwendet\n"
@@@ -6778,17 -5374,14 +6795,17 @@@ msgstr "ungültiger Fingerabdruck
  msgid "ownertrust value missing"
  msgstr "\"Ownertrust\"-Wert fehlt"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "Fehler beim Suchen des \"Trust records\" in `%s': %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "Lesefehler in `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
@@@ -6822,7 -5409,6 +6839,7 @@@ msgstr "trustdb Transaktion zu groß\n
  msgid "%s: directory does not exist!\n"
  msgstr "%s: Verzeichnis existiert nicht!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6962,10 -5520,6 +6979,10 @@@ msgstr "Fehler beim Erstellen einer tem
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
@@@ -6996,7 -5545,6 +7013,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
@@@ -7210,11 -5731,9 +7227,11 @@@ msgstr "gGaAuUlLfF
  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:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7224,18 -5742,15 +7241,18 @@@
  msgid "resetting keydb: %s\n"
  msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, 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:2794
++#: g10/tofu.c:2801
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, fuzzy, c-format
  #| msgid "%d~year"
  #| msgid_plural "%d~years"
@@@ -7244,7 -5759,6 +7261,7 @@@ msgid_plural "%lld~years
  msgstr[0] "%d~Jahr"
  msgstr[1] "%d~Jahre"
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, fuzzy, c-format
  #| msgid "%d~month"
  #| msgid_plural "%d~months"
@@@ -7253,14 -5767,12 +7270,14 @@@ msgid_plural "%lld~months
  msgstr[0] "%d~Monat"
  msgstr[1] "%d~Monate"
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, fuzzy, c-format
  #| msgid "%d~day"
  #| msgid_plural "%d~days"
@@@ -7269,7 -5781,6 +7286,7 @@@ msgid_plural "%lld~days
  msgstr[0] "%d~Tag"
  msgstr[1] "%d~Tage"
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, fuzzy, c-format
  #| msgid "%d~hour"
  #| msgid_plural "%d~hours"
@@@ -7278,7 -5789,6 +7295,7 @@@ msgid_plural "%lld~hours
  msgstr[0] "%d~Stunde"
  msgstr[1] "%d~Stunden"
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, fuzzy, c-format
  #| msgid "%d~minute"
  #| msgid_plural "%d~minutes"
@@@ -7287,7 -5797,6 +7304,7 @@@ msgid_plural "%lld~minutes
  msgstr[0] "%d~Minute"
  msgstr[1] "%d~Minuten"
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, fuzzy, c-format
  #| msgid "%d~second"
  #| msgid_plural "%d~seconds"
@@@ -7296,7 -5805,6 +7313,7 @@@ msgid_plural "%lld~seconds
  msgstr[0] "%d~Sekunde"
  msgstr[1] "%d~Sekunden"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, fuzzy, c-format
  #| msgid "TOFU: few signatures %d message %s"
  #| msgid_plural "TOFU: few signatures %d messages %s"
@@@ -7309,13 -5817,11 +7326,13 @@@ msgstr "
  "suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
  "zu markieren."
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d Beglaubigungen entfernt.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7332,13 -5838,11 +7349,13 @@@ msgstr[1] "
  "%ld überprüfte Nachrichten von \"%s\"\n"
  "in den letzten %s."
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "Verschlüsselt mit %lu Passphrases\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7355,13 -5859,11 +7372,13 @@@ msgstr[1] "
  "%ld überprüfte Nachrichten von \"%s\"\n"
  "in den letzten %s."
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "policy: %s"
  msgid "(policy: %s)"
  msgstr "Richtlinie: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid ""
@@@ -7370,7 -5872,6 +7387,7 @@@ msgstr "
  "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
  "sehen.\n"
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid ""
@@@ -7379,7 -5880,6 +7396,7 @@@ msgstr "
  "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
  "gesehen.\n"
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  #, 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"
@@@ -7387,7 -5887,6 +7404,7 @@@ msgstr "
  "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
  "sehen.\n"
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  #, 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"
@@@ -7395,7 -5894,6 +7412,7 @@@ msgstr "
  "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
  "gesehen.\n"
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7436,18 -5934,14 +7453,18 @@@ msgstr[1] "
  "  %s\n"
  "um den Schlüssel als Fälschung zu markieren.\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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7500,51 -5985,41 +7517,51 @@@ msgstr "
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "verwende Vertrauensmodell %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "Bitte ein --check-trustdb durchführen\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "\"Trust-DB\" wird überprüft\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7552,23 -6027,19 +7569,23 @@@ msgstr[0] "%d Schlüssel bislang bearbe
  msgstr[1] "%d Schlüssel bislang bearbeitet"
  
  # translated by wk
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, 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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7576,7 -6047,6 +7593,7 @@@ msgstr "
  "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7687,19 -6136,14 +7704,19 @@@ msgstr "
  "Syntax: kbxutil [Optionen] [Dateien]\n"
  "Anlisten exportieren und Importieren von KeyBox Dateien\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-Callback meldete Fehler: %s\n"
@@@ -7755,7 -6190,6 +7772,7 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
@@@ -7770,68 -6202,66 +7787,83 @@@ msgstr "Der Fingerabdruck kann nicht ge
  msgid "failed to store the creation date: %s\n"
  msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  msgid "response does not contain the EC public key\n"
  msgstr "Der EC Schlüssel fehlt in der Antwort\n"
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  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:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr "%sNummer: %s%%0ABesitzer: %s%%0AAnzahl: %lu%s"
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr "%sNummer: %s%%0ABesitzer: %s%s"
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr "Verbliebene Versuche: %d"
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "Die Standard PIN wird für %s benutzt\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
++#: scd/app-openpgp.c:2097
+ msgid "||Please unlock the card"
+ msgstr "||Bitte entsperren Sie die Karte"
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
- msgstr "||Bitte die PIN eingeben"
- 
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "Karte ist dauerhaft gesperrt!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7840,25 -6270,19 +7872,24 @@@ msgstr[0] "Noch %d Admin-PIN-Versuch, b
  msgstr[1] "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Bitte die Admin-PIN eingeben."
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Bitte die PIN eingeben"
+ 
++#: scd/app-openpgp.c:2619
  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:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -7866,109 -6290,85 +7897,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Neuer Rückstellcode"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Neue Admin-PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Neue PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  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:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Bitte die PIN sowie die neue PIN eingeben"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "Fehler beim Lesen der Anwendungsdaten\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "Schlüssel existiert bereits\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "Existierender Schlüssel wird ersetzt werden\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "neue Schlüssel werden erzeugt\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "der neue Schlüssel wird geschrieben\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "Erzeugungsdatum fehlt\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "Nicht unterstützte Kurve\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@@ -7988,51 -6385,39 +8019,51 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NAME|Die Debugstufe auf NAME setzen"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|DATEI|Schreibe Logs auf DATEI"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|Verbinde mit dem Leser auf Port N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAME|Benutze NAME als CT-API Treiber"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|Benutze NAME als PC/SC Treiber"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "Den internen CCID Treiber nicht benutzen"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "Die Tastatur des Kartenlesers nicht benutzen"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8046,22 -6430,14 +8077,17 @@@ msgstr "
  "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
  "auszuführen\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "Handhabungsroutine für fd %d gestartet\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "Handhabungsroutine für den fd %d beendet\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "Der Dirmngr läuft nicht für diese Session\n"
  
@@@ -8078,12 -6451,10 +8104,12 @@@ msgstr "Kette
  msgid "shell"
  msgstr "Schale"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
  
@@@ -8096,11 -6465,9 +8122,11 @@@ msgstr "entscheidende Richtlinie ohne k
  msgid "failed to open '%s': %s\n"
  msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Hinweis: Die unkritische Zertifikatsrichtlinie ist nicht erlaubt"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "Die Zertifikatsrichtlinie ist nicht erlaubt"
  
@@@ -8127,9 -6489,6 +8153,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8151,12 -6506,10 +8177,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "Die CRL konnte nicht geprüft werden: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "Das Zertifikat ist noch nicht gültig"
  
@@@ -8168,7 -6519,6 +8194,7 @@@ msgstr "Das Wurzelzertifikat ist noch n
  msgid "intermediate certificate not yet valid"
  msgstr "Das Zwischenzertifikat ist noch nicht gültig"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "Das Zertifikat ist abgelaufen"
  
@@@ -8221,7 -6560,6 +8247,7 @@@ msgstr "  (  Zertifikat gültig von 
  msgid "  (     issuer valid from "
  msgstr "  ( Herausgeber gültig von "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "Fingerprint=%s\n"
@@@ -8254,7 -6586,6 +8280,7 @@@ msgstr "Im Zertifikat ist kein Herausge
  msgid "self-signed certificate has a BAD signature"
  msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
  
@@@ -8263,30 -6593,24 +8289,30 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "Der Zertifikatkette ist zu lang\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "Herausgeberzertifikat nicht gefunden"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "Das Zertifikat hat eine FALSCHE Signatur"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
  "nochmal"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "Das Zertifikat ist korrekt\n"
  
@@@ -8313,11 -6632,9 +8339,11 @@@ msgid "a %u bit hash is not valid for 
  msgstr ""
  "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(Dies ist der MD2 Algorithmus)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "keine"
  
@@@ -8353,39 -6665,31 +8379,39 @@@ msgstr "
  "gültig von %s bis %s\n"
  "zu entsperren.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
  "sollen\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
  
@@@ -8480,7 -6766,6 +8506,7 @@@ msgstr "Zeile %d: Fehler beim Holen de
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8488,64 -6773,51 +8514,64 @@@ msgstr "
  "Um die Zertifikatsanforderung fertigzustellen, geben Sie nun bitte\n"
  "noch einmal die Passphrase des soeben erzeugten Schlüssels ein.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Vorhandener Schlüssel\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Vorhandener Schlüssel auf der Karte\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "Fehler beim Lesen von der Karte: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Karten-Seriennummer: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Vorhandene Schlüssel:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Mögliche Vorgänge eines %s-Schlüssels:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) signieren, verschlüsseln\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) signieren\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) verschlüsseln\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Bitte geben sie den Namen des X.509 Subjekts ein: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Kein Subjekt-Name angegeben\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Ungültiger Subjekt-Name-Label `%.*s'\n"
@@@ -8555,72 -6827,55 +8581,72 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Ungültiger Subjekt-Name `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "25"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Email-Adresse eingeben"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (Beenden mit einer leeren Zeile):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "DNS Namen eingeben"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (Optional. Beenden mit einer leeren Zeile):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Bitte geben Sie die URIs ein"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Ein eigenbeglaubigtes Zertifikat erzeugen? (j/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Verwendete Parameter:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Das eigenbeglaubigte Zertifikat wird erzeugt.  "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Die Zertifikatsanforderung wird erzeugt.  "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "Dies kann einen Moment dauern ...\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Fertig.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "Fertig.  Sie sollten nun diese Anforderung an die CA senden.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(Dies ist der RC-2 Algorithmus)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dies ist wahrscheinlich keine verschlüsselte Nachricht)\n"
  
@@@ -8753,7 -6977,6 +8779,7 @@@ msgstr "|DATEI|DATEI als öffentlichen 
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
  
@@@ -8834,17 -7041,14 +8860,17 @@@ msgstr "Fehler beim Speichern des Zerti
  msgid "basic certificate checks failed - not imported\n"
  msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "Fehler beim Importieren des Zertifikats: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@@ -8915,7 -7108,6 +8941,7 @@@ msgstr "
  "\n"
  "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8935,168 -7126,138 +8961,173 @@@ msgstr "
  "zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
  "Signatur erzeugen wird."
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird "
  "benutzt\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Signatur erzeugt am "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[Datum nicht vorhanden]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " mittels Zertifikat ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "Ungültige Signatur: Nachricht entspricht nicht dem Prüfwert in der "
  "Nachricht.\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Korrekte Signatur von"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                alias"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Dies ist eine qualifizierte Signatur.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr ""
  "Sperre für den Zertifikatzwischenspeicher kann nicht initialisiert werden: "
  "%s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  "Lesesperre für den Zertifikatzwischenspeicher kann nicht gesetzt werden: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  "Schreibsperre für den Zertifikatzwischenspeicher kann nicht gesetzt werden: "
  "%s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  "Sperre für den Zertifikatzwischenspeicher kann nicht freigegeben werden: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "%u Zertifikate werden aus dem Zertifikatzwischenspeicher entfernt\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "Zertifikat `%s' kann nicht zerlegt werden: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "Zertifikat `%s' ist bereits im Zwischenspeicher\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Vertrauenswürdiges Zertifikat `%s' wurde geladen\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "Zertifikat `%s' wurde geladen\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  SHA1 Fingerabdruck=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "   Issuer ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "  Subjekt ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "Fehler beim Laden des Zertifikats `%s': %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "   dauerhaft geladene Zertifikate: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "zur Laufzeit zwischengespeicherte Zertifikate: %u\n"
+ msgstr " zwischengespeicherte Zertifikate: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "    vertrauenswürdige Zertifikate: %u (%u,%u,%u,%u)\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "Zertifikat wurde zwischengespeichert\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "ungültiger SHA1 Fingerabdruck `%s'\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "Fehler beim Holen des Zertifikats mittels Seriennummer: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "Fehler beim Holen des Zertifikats mittels Subject: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "Im Zertifikat ist kein Herausgeber enthalten\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n"
@@@ -9131,7 -7286,6 +9162,7 @@@ msgstr "Die Zwischenspeicherdatei `%s' 
  msgid "not removing file '%s'\n"
  msgstr "Die Datei `%s' wird nicht gelöscht\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
@@@ -9370,7 -7480,6 +9401,7 @@@ msgstr "S/N %s ist gültig; sie ist nic
  msgid "error getting data from cache file: %s\n"
  msgstr "Fehler beim Holen der Daten aus der Zwischenspeicherdatei: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "Ungültige Hashmethode `%s'\n"
@@@ -9384,12 -7491,10 +9415,12 @@@ msgstr "gcry_md_open für Methode %d fe
  msgid "got an invalid S-expression from libksba\n"
  msgstr "Ungültige S-Expression von Libksba erhalten\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
@@@ -9439,86 -7535,70 +9470,86 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "Fehler beim Püfen des CRL Herausgeberzertifikats: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "ksba_crl_new fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "Die alte temporäre Zwischenspeicherdatei `%s' wurde entfernt\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr ""
  "Problem beim Löschen der alten temporären Zwischenspeicherdatei `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "Fehler beim Erzeugen der temporären Zwischenspeicherdatei `%s': %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "crl_parse_insert fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr ""
  "Fehler beim Fertigstellen der temporären Zwischenspeicherdatei `%s': %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "Fehler beim Schließen der temporären Zwischenspeicherdatei `%s': %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "WARNUNG: Neue CRL ist immer noch zu alt; sie verfiel am %s - wird trotzdem "
  "geladen\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "Neue CRL ist immer noch zu alt; sie verviel am %s\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "Unbekannte kritische CRL Erweiterung %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9526,69 -7606,56 +9557,69 @@@ msgstr "
  "Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
  "Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "Anfang CRL Ausgabe (geholt via %s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  " FEHLER: Die CRL wird nicht benutzt, da sie trotz eines Updates zu alt war!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  " FEHLER: Die CRL wird nicht benutzt, da sie eine unbekannte kritische CRL "
  "Erweiterung trägt!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " FEHLER: Die CRL wird nicht benutzt\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  " FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert "
  "worden!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " WARNUNG: Ungültige Länge eines Zwischenspeicherdatensatzes\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "Problem beim Lesen eines Zwischenspeicherschlüssels: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "Fehler beim Lesen eine Zwischenspeichereintrags aus der DB: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Ende CRL Ausgabe\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@@ -9597,47 -7663,35 +9628,47 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "\"reader to file\" Zuordnungstabelle ist voll - warte\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "Es wird \"HTTP\" anstatt \"HTTPS\" verwendet\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "zu viele verschachtelte Umleitungen\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "Fehler beim Holen von `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "Fehler beim Holen von `%s': HTTP Status %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "CRL Zugriff ist im Tor Modus nicht möglich\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
@@@ -9779,112 -7804,84 +9810,112 @@@ msgstr "Absoluter Dateiname erwartet\n
  msgid "looking up '%s'\n"
  msgstr "Auffinden von `%s'\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|Hole eine CRL von dieser URL"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "Den Dirmngr herunterfahren"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "Den Zwischenspeicher löschen"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "Ausführung ohne Benutzernachfrage"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "Laden von abgelaufenen CRLs erzwingen"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "OCSP Anfragen erlauben"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr "Online Softwareversionstest erlauben"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "Sperre die Benutzung von HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "Sperre die Benutzung von LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "Übergehe HTTP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "Übergehe LDAP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|Leite alle HTTP Anfragen über URL"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|Benutze HOST für LDAP Anfragen"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  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:223
++#: dirmngr/dirmngr.c:225
  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:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "Netzzugriff nur über Tor"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9894,11 -7891,9 +9925,11 @@@ msgstr "
  "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
  "und Optionen)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9906,79 -7901,62 +9937,79 @@@ msgstr "
  "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
  "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "Gültige Debugebenen sind: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "Aufruf: %s [Optionen] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: Lesefehler: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, 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:1776
  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:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "Herunterfahren wurde erzwungen\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -10208,35 -8138,28 +10239,35 @@@ msgstr "Ungültiges Zeichen 0x%02X im H
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "`%s:%d' wird der LDAP Serverliste hinzugefügt\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "malloc() fehlgeschlagen: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search erreichte die Größengrenze des Servers\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "Ungültige kanonische S-Expression gefunden\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "gcry_md_open fehlgeschlagen: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "Nanu: ksba_cert_hash fehlgeschlagen: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "Fehlerhafte URL Kodierung erkannt\n"
  
@@@ -10268,246 -8185,190 +10299,242 @@@ msgstr "Fehler beim Setzen des OCSP Zie
  msgid "error building OCSP request: %s\n"
  msgstr "Fehler beim Aufbauen der OCSP Anfrage: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "Fehler beim Verbinden mit '%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "Fehler beim Lesen der HTTP Antwort von `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "Fehler beim Zerlegen der OCSP Antwort für `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "OCSP Responder `%s' Status: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "Hashen der OCSP Antwort für `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "Lediglich SHA-1 wird bei OCSP Antworten unterstützt\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "malloc() fehlgeschlagen: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "Fehler beim Holen der Responder-ID: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  "Kein benutzbares Zertifikat zur Überprüfung der OCSP Antwort gefunden\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "Aufrufer gab das Ziel Zertifikat nicht zurück\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "Aufrufer gab das Issuer Zertifikat nicht zurück\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "Kein  voreingestellter OCSP Responder definiert\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "Der voreingestellte OCSP Responder `%s' wird benutzt\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "Der OCSP Responder `%s' wird benutzt\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "Kontext zum Hashen von OCSP kann nicht erzeugt werden: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "Fehler beim Holen des OCSP Status für das Zielzertifikat: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "Zertifikatstatus ist: %s  (this=%s  next=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "Gut"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "Zertifikat wurde widerrufen am: %s wegen: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "OCSP Responder gab einen Status in der Zukunft zurück\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP Responder gab einen zu alten Status zurück\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "LDAP Server fehlt"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "Seriennummer fehlt in der Cert-ID"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquire fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "Fehler beim Senden der Daten: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d überschritten\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "Fehler beim Initialisieren des Servers: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept Problem: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  "Herausgeberzertifikat akzeptiert obgleich nicht für eine CA gekennzeichnet"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "CRL Überprüfung ist zu tief geschachtelt\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "keine Prüfung der CRL für"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "Prüfen der CRL für"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr ""
  "Prüfung der Vertrauenswürdigkeit des Wurzelzertifikats fehlgeschlagen: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "Der Zertifikatkette ist gültig\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA benötigt eine 160 Bit Hashmethode\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
@@@ -10603,186 -8443,139 +10630,186 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  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:723
- #: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Optionen zur Einstellung der Sicherheit"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Optionen für eine Passphrase-Policy"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "Einhaltung der Passphrase-Policy erzwingen"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "Verbiete die Wiedernutzung alter Passphrases."
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|Auch an NAME verschlüsseln"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|Email Alias festlegen"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration der Schlüsselserver"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "Benutze Schlüsselserver unter der URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Optionen zum Einstellen der Ausgabeformate"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Optionen zur Benutzung von Tor"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration für HTTP Server"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "Benutze die HTTP Proxy Einstellung des Systems"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration der zu nutzenden LDAP-Server"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "Liste der LDAP Server"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Konfiguration zu OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr "Geheime Schlüssel"
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr "Smartcard"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr "Netz"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  msgid "Passphrase Entry"
  msgstr "Passphrase Eingabe"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Komponente unterstützt kein direktes starten"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, c-format
  msgid "error closing '%s'\n"
  msgstr "Fehler beim Schließen von '%s'\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, c-format
  msgid "error parsing '%s'\n"
  msgstr "Fehler beim Hashen von '%s'\n"
diff --cc po/el.po
index b562b04,956ba1a..8637fdb
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -17,7 -16,6 +17,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@@ -28,40 -26,31 +28,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -69,7 -58,6 +69,7 @@@ msgstr "μη έγκυρη φράση κ
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -79,75 -67,59 +79,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "κακή φράση κλειδί"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "κακό MPI"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "κακή φράση κλειδί"
@@@ -157,150 -128,115 +157,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Επαναλάβετε τη φράση κλειδί: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Επαναλάβετε τη φράση κλειδί: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Επαναλάβετε τη φράση κλειδί: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -385,48 -307,33 +392,48 @@@ msgstr "
  "Επιλογές:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Το κλειδί έχει παρακαμθεί"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ήσυχη έξοδος"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -511,11 -401,6 +518,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -531,47 -414,34 +538,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "ανάγνωση επιλογών από `%s'\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -581,28 -450,22 +588,28 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
@@@ -630,7 -487,6 +637,7 @@@ msgstr "trustdb: read απέτυχε (n
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -655,12 -507,10 +662,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: παραλείφθηκε: %s\n"
@@@ -682,8 -528,6 +689,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -691,9 -535,6 +698,9 @@@ msgstr "
  "@Εντολές:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -747,8 -580,6 +754,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -807,8 -629,6 +814,8 @@@ msgstr "
  msgid "Yes"
  msgstr "ναι|ναί"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -859,19 -672,16 +866,19 @@@ msgstr "αλλαγή της φράση�
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "ενεργοποιεί ένα κλειδί"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -891,7 -698,6 +898,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
@@@ -918,22 -720,14 +925,22 @@@ msgstr "δεν υποστηρίζετα
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -948,8 -740,6 +955,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -959,12 -748,10 +966,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@@ -1191,8 -932,6 +1198,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1328,7 -1040,10 +1335,12 @@@ msgstr "σφάλμα στη γραμμ�
  msgid "[none]"
  msgstr "άγνωστο"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
@@@ -1404,7 -1105,6 +1416,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "μη επεξεργασμένο"
@@@ -1463,8 -1152,6 +1475,8 @@@ msgstr "το δημόσιο κλειδ�
  msgid "waiting for lock %s...\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1633,8 -1287,6 +1645,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
@@@ -1644,15 -1295,10 +1656,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Η επιλογή σας; "
  
@@@ -1719,17 -1351,11 +1731,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
@@@ -1796,7 -1409,6 +1808,7 @@@ msgstr "Η δημιουργία κλε�
  msgid "not an OpenPGP card"
  msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@@ -1827,13 -1434,10 +1839,13 @@@ msgstr "Τι μέγεθος κλειδ�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1888,9 -1482,6 +1900,9 @@@ msgstr "   (%d) RSA (για κρυπτ�
  msgid "   (3) Authentication key\n"
  msgstr ""
  
 +#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Μη έγκυρη επιλογή.\n"
  
@@@ -2025,23 -1587,15 +2037,23 @@@ msgstr "Μη έγκυρη εντολ�
  msgid "--output doesn't work for this command\n"
  msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1646,6 +2116,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -2144,7 -1679,6 +2156,7 @@@ msgstr "
  "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
  "επιλογές του παραλήπτη\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2278,41 -1788,32 +2290,41 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: παραλείφθηκε: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "εγγραφή στο  `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr ""
  "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "κλειδί %08lX:  κλειδί τύπου PGP 2.x - παραλείφθηκε\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2594,7 -2034,6 +2606,7 @@@ msgstr "|N|καθορισμός επι�
  msgid "use canonical text mode"
  msgstr "χρήση κανονικής κατάστασης κειμένου"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
@@@ -2778,476 -2189,378 +2790,480 @@@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μ�
  msgid "unknown configuration item '%s'\n"
  msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "αδυναμία ορισμού του exec-path σε %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
  "ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
  "δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "μη έγκυρες προεπιλογές\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
  "δημοσίου κλειδιού\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "keyserver λήψη απέτυχε: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "keyserver αναζήτηση απέτυχε: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "keyserver ανανέωση απέτυχε: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "αποθωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδοθήκη"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Χρήση: gpgv [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4607,15 -3655,10 +4623,15 @@@ msgstr "
  "Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
  "εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[ανακλημένο]"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4655,7 -3692,6 +4671,7 @@@ msgstr "Σίγουρα ακόμα θέ�
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4687,7 -3717,6 +4703,7 @@@ msgstr[1] "Διαγράφτηκε %d υ
  msgid "Nothing deleted.\n"
  msgstr "Τίποτα δεν διαγράφτηκε.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "μη έγκυρη θωράκιση"
@@@ -4940,74 -3921,58 +4956,74 @@@ msgstr "το user ID \"%s\" έχει ή
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "εγγραφή άμεσης υπογραφής\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "εγγραφή ιδιο-υπογραφής\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "κρυπτογράφηση δεδομένων"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5021,157 -3986,126 +5037,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Σημείωση υπογραφής: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5187,7 -4121,6 +5203,7 @@@ msgstr "
  "      <n>m = το κλειδί λήγει σε n μήνες\n"
  "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5203,40 -4136,32 +5219,40 @@@ msgstr "
  "      <n>m = το κλειδί λήγει σε n μήνες\n"
  "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Το κλειδί είναι έγκυρο για; (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "μη έγκυρη τιμή\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "το %s λήγει στις %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Υπογραφή λήγει στις %s.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5244,12 -4169,10 +5260,12 @@@ msgstr "
  "Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
  "Όμως, θα χειρίζονται σωστά έως το 2106.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Είναι αυτό σωστό (y/n); "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5260,7 -4183,6 +5276,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5277,50 -4199,39 +5293,50 @@@ msgstr "
  "    \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Αληθινό Όνομα: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Διεύθυνση Email: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Σχόλιο: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5331,7 -4242,6 +5347,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
  
@@@ -5346,35 -4256,28 +5362,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5386,13 -4289,10 +5402,13 @@@ msgstr "
  "τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
  "στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5400,66 -4300,53 +5416,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5470,7 -4357,6 +5486,7 @@@ msgstr "
  "Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
  "ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5478,7 -4364,6 +5494,7 @@@ msgstr "
  "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
  "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5486,7 -4371,6 +5502,7 @@@ msgstr "
  "το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
  "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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"
@@@ -5494,16 -4378,13 +5510,16 @@@ msgstr "
  "ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
  "με το OpenPGP\n"
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Σίγουρα να δημιουργηθεί; "
@@@ -5586,26 -4451,22 +5602,26 @@@ msgstr "     Αποτύπωμα κλε�
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "έλεγχος κλειδοθήκης `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογραφές)\n"
  msgstr[1] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογραφές)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5613,7 -4474,6 +5629,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 κακή υπογραφή\n"
  msgstr[1] "1 κακή υπογραφή\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: κλειδοθήκη δημιουργήθηκε\n"
@@@ -5916,7 -4714,6 +5932,7 @@@ msgstr "δυαδικό
  msgid "textmode"
  msgstr "κατάσταση-κειμένου"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "άγνωστο"
  
@@@ -6136,55 -4891,44 +6152,55 @@@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: π�
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "υποπακέτο τύπου %d έχει ορισμένο το κριτικό bit\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Πληκτρολογήστε τη φράση κλειδί\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "ακυρώθηκε από το χρήστη\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (κύριο κλειδί, ID %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6622,17 -5283,14 +6638,17 @@@ msgstr "παλαιά κωδικοποί
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "ο αλγόριθμος κρυπτογράφησης %d%s είναι άγνωστος ή απενεργοποιημένος\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "ΣΗΜΕΙΩΣΗ: ο αλγόριθμος κρυπτογράφησης %d δεν είναι στις επιλογές\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6935,7 -5544,6 +6951,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s υπογραφή από: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6943,11 -5551,9 +6959,11 @@@ msgstr "
  "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
  "προεπιλογές του παραλήπτη\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "υπογραφή:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
@@@ -7012,17 -5607,14 +7028,17 @@@ msgstr "σφάλμα: μη έγκυρ�
  msgid "ownertrust value missing"
  msgstr "εισαγωγή των τιμών εμπιστοσύνης"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "σφάλμα στην εύρεση της εγγραφής εμπιστοσύνης: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync απέτυχε: %s\n"
@@@ -7056,7 -5642,6 +7072,7 @@@ msgstr "πολύ μεγάλη συνα�
  msgid "%s: directory does not exist!\n"
  msgstr "%s: ο φάκελος δεν υπάρχει!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "αδυναμία κλεισίματος του `%s': %s\n"
@@@ -7199,10 -5756,6 +7215,10 @@@ msgstr "σφάλμα στη δημιο�
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7234,7 -5782,6 +7250,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7406,11 -5926,9 +7422,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7419,121 -5936,101 +7435,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Διαγράφηκαν %d υπογραφές.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  msgid "Encrypted %ld~message in the past %s."
  msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Πολιτική: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7550,18 -6047,14 +7566,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7613,56 -6097,45 +7629,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "παρακαλώ κάντε ένα --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "έλεγχος της trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  msgstr[1] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7670,23 -6143,19 +7686,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
  msgstr[1] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr ""
  "δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@@ -7800,19 -6248,14 +7816,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7861,7 -6295,6 +7877,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -7876,69 -6307,67 +7892,84 @@@ msgstr "αποτυχία αρχικοπ
  msgid "failed to store the creation date: %s\n"
  msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, fuzzy
  #| msgid "remove keys from the public keyring"
  msgid "response does not contain the EC public key\n"
  msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7947,27 -6376,22 +7978,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "αλλαγή της φράσης κλειδί"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "αλλαγή της φράσης κλειδί"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7975,117 -6399,93 +8006,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "μη υποστηριζόμενο URI"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
@@@ -8106,57 -6503,45 +8137,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "μη χρήση τερματικού"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "συγκρουόμενες εντολές\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8166,22 -6550,14 +8197,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@@ -8200,12 -6573,10 +8226,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "δεν υποστηρίζεται η έκδοση πρωτοκόλλου %d του gpg-agent\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8218,12 -6587,10 +8244,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
@@@ -8251,9 -6613,6 +8277,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8276,12 -6631,10 +8302,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8294,7 -6645,6 +8320,7 @@@ msgstr "εγγραφή του μυστ�
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Αυτό το κλειδί έχει λήξει!"
@@@ -8350,7 -6689,6 +8376,7 @@@ msgstr "κακό πιστοποιητι
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "απεικόνιση του fingerprint"
@@@ -8380,7 -6712,6 +8406,7 @@@ msgstr "δημιουργία ενός �
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8389,29 -6719,23 +8415,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "επαλήθευση μιας υπογραφής"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
@@@ -8440,11 -6759,9 +8466,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "όχι|οχι"
@@@ -8481,36 -6793,28 +8507,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bit %s κλειδί, ID %08lX, δημιουργία %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8604,72 -6890,58 +8630,72 @@@ msgstr "αδυναμία δημιουρ
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "απενεργοποιεί ένα κλειδί"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (υπογραφή και κρυπτογράφηση)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Δεν δώθηκε περιγραφή)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
@@@ -8679,81 -6951,64 +8705,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Διεύθυνση Email: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Πληκτρολογήστε το user ID. Τέλος με μια άδεια γραμμή: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Πληκτρολογήστε ένα νέο όνομα αρχείου"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Πληκτρολογήστε μια προαιρετική περιγραφή· τέλος με μια άδεια γραμμή:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8895,7 -7119,6 +8921,7 @@@ msgstr "προσθήκη αυτού τ�
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
@@@ -8983,17 -7190,14 +9009,17 @@@ msgstr "δημιουργία ενός �
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -9057,7 -7250,6 +9083,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9071,168 -7262,138 +9097,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Καλή υπογραφή από \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                γνωστό σαν \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Αυτή θα είναι μια ιδιο-υπογραφή.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "απεικόνιση του fingerprint"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "κακό πιστοποιητικό"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@@ -9269,7 -7424,6 +9300,7 @@@ msgstr "διαγραφή block κλει
  msgid "not removing file '%s'\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -9495,7 -7605,6 +9526,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9512,12 -7619,10 +9543,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "μη έγκυρη απάντηση από τον agent\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@@ -9567,113 -7663,91 +9598,113 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "καταστολή ανάκλησης υπογραφής\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "εγγραφή στο  `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
@@@ -9681,36 -7755,29 +9712,36 @@@ msgstr "
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
  "χρησιμοποιείτε\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@@ -9719,50 -7785,38 +9750,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
@@@ -9915,116 -7940,88 +9946,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Τερματισμός χωρίς αποθήκευση; "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10037,91 -8034,72 +10068,91 @@@ msgstr "
  "@\n"
  "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "χρήση: gpg [επιλογές] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "μη επεξεργασμένο"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10361,38 -8291,31 +10392,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "αναζήτηση του \"%s\" από το HKP διακομιστή %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: μη έγκυρη έκδοση αρχείου %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10425,255 -8342,199 +10456,251 @@@ msgstr "σφάλμα κατά την α
  msgid "error building OCSP request: %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: αδυναμία πρόσβασης: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "δεν υπάρχει προκαθορισμένη κλειδοθήκη: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "χρήση του κρυπταλγόριθμου: %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "έλεγχος της trustdb\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "επαλήθευση μιας υπογραφής"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "ο DSA απαιτεί τη χρήση ενός 160 bit αλγόριθμου hash\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10770,193 -8610,146 +10797,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|χρήση της κατάστασης φράσης κλειδί N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "σφάλμα δικτύου"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "κακή φράση κλειδί"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "δεν βρέθηκε το δημόσιο κλειδί"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
diff --cc po/en at boldquot.po
index 926a731,0000000..59675fb
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10679 -1,0 +1,10705 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2017 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2017.
 +#
 +# 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.18\n"
++"Project-Id-Version: GNU gnupg 2.1.19\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
++"PO-Revision-Date: 2017-03-01 16:34+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
++#: agent/call-pinentry.c:296
 +#, 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
++#: agent/call-pinentry.c:499
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
 +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
++#: agent/call-pinentry.c:507
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
 +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
++#: agent/call-pinentry.c:840
 +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
++#: agent/call-pinentry.c:861
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
 +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
++#: agent/call-pinentry.c:992
 +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
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +msgid "PIN:"
 +msgstr "PIN:"
 +
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: 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
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 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
++#: agent/call-pinentry.c:1076
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
 +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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
 +#, 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
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
 +#, 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
++#: agent/command-ssh.c:2448
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
 +#, 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
++#: agent/command-ssh.c:2473
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
++#, c-format
++msgid "error getting list of cards: %s\n"
++msgstr "error getting list of cards: %s\n"
++
++#: agent/command-ssh.c:2775
 +#, 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
++#: agent/command-ssh.c:2782
 +msgid "Allow"
 +msgstr "Allow"
 +
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
 +msgid "Deny"
 +msgstr "Deny"
 +
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
 +#, 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
++#: agent/command-ssh.c:3030 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
 +#, 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
++#: agent/command-ssh.c:3617
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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:210
++#: agent/divert-scd.c:244
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
 +msgid "PUK"
 +msgstr "PUK"
 +
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
 +#, 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:297
++#: agent/divert-scd.c:354
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
 +#, 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
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
 +#, 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:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
 +msgid "run in supervised mode"
 +msgstr "run in supervised mode"
 +
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
 +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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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:492
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
 +#: agent/gpg-agent.c:494
 +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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
 +#: agent/gpg-agent.c:2147
 +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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
 +#: agent/gpg-agent.c:2203 agent/gpg-agent.c:2246 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:2206 agent/gpg-agent.c:2251 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:2257
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
 +#: agent/gpg-agent.c:2261
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
 +#: agent/gpg-agent.c:2611
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
 +#: agent/gpg-agent.c:2616
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
 +#: agent/gpg-agent.c:2691
 +#, 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:2696
 +#, 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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
 +#: agent/gpg-agent.c:3104 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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: 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
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: 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
++#: agent/findkey.c:1460
 +#, 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
++#: agent/findkey.c:1484 agent/findkey.c:1498
 +msgid "Delete key"
 +msgstr "Delete key"
 +
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
 +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
++#: agent/pksign.c:517
 +#, 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: 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:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
 +#, 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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
 +#, 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:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 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:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
 +#, c-format
 +msgid "waiting for processes to terminate failed: %s\n"
 +msgstr "waiting for processes to terminate failed: %s\n"
 +
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 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:148
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
 +#: 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:282
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
 +#: 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: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: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:3102
++#: scd/app-openpgp.c:3257
 +#, 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/ksba-io-support.c:338
++#, c-format
++msgid "invalid radix64 character %02x skipped\n"
++msgstr "invalid radix64 character %02x skipped\n"
++
 +#: 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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
 +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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
 +#, 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: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: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:1306
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
 +#: 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: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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
 +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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
 +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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 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:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: 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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
 +#, 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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
 +#, c-format
 +msgid "%s keysizes must be in the range %u-%u\n"
 +msgstr "%s keysizes must be in the range %u-%u\n"
 +
 +#: g10/card-util.c: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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 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: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: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:2817
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
 +#: 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:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
 +#, 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: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:986
++#: g10/encrypt.c:707 g10/sign.c:993
 +#, 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: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:120
 +msgid "use the GnuPG key backup format"
 +msgstr "use the GnuPG key backup format"
 +
- #: g10/export.c:1232
++#: g10/export.c:1235
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
- #: g10/export.c:1691
++#: g10/export.c:1694
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
- #: g10/export.c:1877
++#: g10/export.c:1880
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
- #: g10/export.c:1954
++#: g10/export.c:1957
 +#, 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:2042
++#: g10/export.c:2043
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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: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:426 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
 +#: g10/gpg.c:427
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
 +#: g10/gpg.c:429 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
 +#: g10/gpg.c:430 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
 +#: g10/gpg.c:432
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
 +#: g10/gpg.c:434 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
 +#: g10/gpg.c:436 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
 +#: g10/gpg.c:438 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
 +#: g10/gpg.c:440
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
 +#: g10/gpg.c:443
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
 +#: g10/gpg.c:445 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
 +#: g10/gpg.c:446 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
 +#: g10/gpg.c:448 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
 +#: g10/gpg.c:451
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
 +#: g10/gpg.c:454
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
 +#: g10/gpg.c:459
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
 +#: 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:467
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
 +#: 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:472
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
 +#: g10/gpg.c:474
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
 +#: g10/gpg.c:476
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
 +#: g10/gpg.c:477
 +msgid "sign a key"
 +msgstr "sign a key"
 +
 +#: g10/gpg.c:478
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
 +#: g10/gpg.c:479
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
 +#: g10/gpg.c:481 sm/gpgsm.c:234
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
 +#: g10/gpg.c:485
 +msgid "export keys"
 +msgstr "export keys"
 +
 +#: g10/gpg.c:486
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
 +#: g10/gpg.c:487
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
 +#: g10/gpg.c:490
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
 +#: g10/gpg.c:492
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
 +#: g10/gpg.c:498
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
 +#: g10/gpg.c:501
 +msgid "print the card status"
 +msgstr "print the card status"
 +
 +#: g10/gpg.c:502
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
 +#: g10/gpg.c:504
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
 +#: g10/gpg.c:516
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
 +#: g10/gpg.c:525
 +msgid "print message digests"
 +msgstr "print message digests"
 +
 +#: g10/gpg.c:528 sm/gpgsm.c:229
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
 +#: 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:534 sm/gpgsm.c:248
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
 +#: 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: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:559
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
 +#: g10/gpg.c:566
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
 +#: 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:599
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
 +#: g10/gpg.c:648
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
 +#: 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:677
 +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"
 +msgstr ""
 +"@\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:1047
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
 +#: 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:1061 sm/gpgsm.c:580
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
 +#: g10/gpg.c:1064
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
 +#: g10/gpg.c:1071 g10/keyedit.c:3483
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
 +#: g10/gpg.c:1078
 +msgid "Hash: "
 +msgstr "Hash: "
 +
 +#: g10/gpg.c:1085 g10/keyedit.c:3532
 +msgid "Compression: "
 +msgstr "Compression: "
 +
 +#: 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:1342 sm/gpgsm.c:743
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
 +#: 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:1558
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
 +#: 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:1564
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
 +#: 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:1573
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
 +#: 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: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: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: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: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: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: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:1816
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
 +#, c-format
 +msgid "valid values for option '%s':\n"
 +msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
 +#, c-format
 +msgid "invalid value for option '%s'\n"
 +msgstr "invalid value for option ‘%s’\n"
 +
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
 +#, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
 +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:3735
++#: g10/gpg.c:3739
 +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:3737
++#: g10/gpg.c:3741
 +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:3740
++#: g10/gpg.c:3744
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
 +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:3751
++#: g10/gpg.c:3755
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
 +#, 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:3851
++#: g10/gpg.c:3855
 +#, 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:3856
++#: g10/gpg.c:3860
 +#, 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:3955
++#: g10/gpg.c:3959
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
 +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:4038
++#: g10/gpg.c:4042
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
 +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:4070
++#: g10/gpg.c:4074
 +#, 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:4127
++#: g10/gpg.c:4131
 +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:4130
++#: g10/gpg.c:4134
 +#, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
 +#, 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:4904
++#: g10/gpg.c:4901
++msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
++msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
++
++#: g10/gpg.c:4912
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
 +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:152
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
 +#: 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:158
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
 +#: g10/import.c:161
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
 +#: g10/import.c:164
 +msgid "show key during import"
 +msgstr "show key during import"
 +
 +#: g10/import.c:167
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
 +#: g10/import.c:170
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
 +#: 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:176
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
 +#: g10/import.c:179
 +msgid "assume the GnuPG key backup format"
 +msgstr "assume the GnuPG key backup format"
 +
 +#: g10/import.c:341 g10/import.c:583
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
 +#: g10/import.c:600
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
 +#: g10/import.c:670
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
 +#: g10/import.c:673
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
 +#: g10/import.c:675
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
 +#: g10/import.c:678
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
 +#: g10/import.c:681 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
 +#: g10/import.c:685 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
 +#: g10/import.c:687
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
 +#: g10/import.c:689
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
 +#: g10/import.c:691
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
 +#: g10/import.c:693
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
 +#: g10/import.c:695 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
 +#: g10/import.c:697 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
 +#: g10/import.c:699 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
 +#: g10/import.c:701 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
 +#: g10/import.c:703
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
 +#: g10/import.c:705
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
 +#: g10/import.c:1052
 +#, 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:1094
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
 +#: g10/import.c:1109
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
 +#: g10/import.c:1121
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
 +#: g10/import.c:1134
 +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:1136
 +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:1161
 +#, 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:1397 g10/import.c:2185
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
 +#: g10/import.c:1403
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
 +#: g10/import.c:1404 g10/import.c:2159
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
 +#: g10/import.c:1434
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
 +#: g10/import.c:1452
 +#, 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:1462 g10/import.c:1493
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
 +#: g10/import.c:1464
 +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:1534 g10/import.c:2336
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
 +#: g10/import.c:1540
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
 +#: g10/import.c:1555
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
 +#: g10/import.c:1564 g10/import.c:1665 g10/import.c:2402
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
 +#: g10/import.c:1584
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
 +#: g10/import.c:1608
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
 +#: g10/import.c:1624 g10/import.c:2360
 +#, 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:1632 g10/import.c:2367
 +#, 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:1675
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
 +#: g10/import.c:1678
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
 +#: g10/import.c:1681
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
 +#: g10/import.c:1684
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
 +#: g10/import.c:1687
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
 +#: g10/import.c:1690
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
 +#: g10/import.c:1693
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
 +#: g10/import.c:1696
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
 +#: g10/import.c:1699
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
 +#: g10/import.c:1702
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
 +#: g10/import.c:1725
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
 +#: g10/import.c:2037 g10/import.c:2282
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
 +#: g10/import.c:2045
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
 +#: g10/import.c:2053
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
 +#: g10/import.c:2158
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
 +#: g10/import.c:2178 g10/import.c:2213
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
 +#: g10/import.c:2202
 +#, 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:2274
 +#, 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:2329
 +#, 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:2378
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
 +#: g10/import.c:2411
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
 +#: g10/import.c:2487
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
 +#: g10/import.c:2504
 +#, 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:2506
 +#, 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:2523 g10/import.c:2549 g10/import.c:2600
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
 +#: g10/import.c:2524
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
 +#: g10/import.c:2538
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
 +#: g10/import.c:2551
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
 +#: g10/import.c:2567
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
 +#: g10/import.c:2589
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
 +#: g10/import.c:2602
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
 +#: g10/import.c:2617
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
 +#: g10/import.c:2659
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
 +#: g10/import.c:2683
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
 +#: g10/import.c:2712
 +#, 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:2723
 +#, 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:2741
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
 +#: g10/import.c:2755
 +#, 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:2763
 +#, 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:2905
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
 +#: g10/import.c:2969
 +#, 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:2985
 +#, 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:3049
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
 +#: g10/import.c:3087
 +#, 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:1786
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
 +#: g10/keyedit.c:265
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
 +#: g10/keyedit.c:265
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
 +#: 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: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: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:801
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
 +#: g10/keyedit.c:914
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
 +#: 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:920 g10/keylist.c:477
 +#, 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:924 g10/keylist.c:473
 +#, 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: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: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: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:997 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
 +#: 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: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: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: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:1169
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
 +#: 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: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:1197
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
 +#: 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:1254
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
 +#: g10/keyedit.c:1256
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
 +#: 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: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: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: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: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: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: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:1360
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
 +#: 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:1387
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
 +#: g10/keyedit.c:1411
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
 +#: 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: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: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:1481
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
 +#: 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:1485
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
 +#: 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:1495
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
 +#: 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:1530
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
 +#: 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: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:1552
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
 +#: 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:1566
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
 +#: g10/keyedit.c:1571
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
 +#: 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:1588
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
 +#: 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: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:1756
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
 +#: g10/keyedit.c:1870
 +msgid "save and quit"
 +msgstr "save and quit"
 +
 +#: g10/keyedit.c:1873
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
 +#: g10/keyedit.c:1874
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
 +#: g10/keyedit.c:1875
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
 +#: g10/keyedit.c:1877
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
 +#: g10/keyedit.c:1878
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
 +#: g10/keyedit.c:1879
 +msgid "check signatures"
 +msgstr "check signatures"
 +
 +#: 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:1890
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
 +#: 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:1893
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
 +#: g10/keyedit.c:1895
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
 +#: g10/keyedit.c:1897
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
 +#: g10/keyedit.c:1898
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
 +#: g10/keyedit.c:1901
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
 +#: g10/keyedit.c:1904
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
 +#: g10/keyedit.c:1906
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
 +#: g10/keyedit.c:1908
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
 +#: g10/keyedit.c:1910
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
 +#: g10/keyedit.c:1912
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
 +#: g10/keyedit.c:1914
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
 +#: 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:1918
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
 +#: g10/keyedit.c:1921
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
 +#: g10/keyedit.c:1922
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
 +#: 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: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:1929
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
 +#: g10/keyedit.c:1931
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
 +#: g10/keyedit.c:1934
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
 +#: g10/keyedit.c:1937
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
 +#: g10/keyedit.c:1939
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
 +#: g10/keyedit.c:1942
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
 +#: g10/keyedit.c:1944
 +msgid "enable key"
 +msgstr "enable key"
 +
 +#: g10/keyedit.c:1945
 +msgid "disable key"
 +msgstr "disable key"
 +
 +#: g10/keyedit.c:1947
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
 +#: 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: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:2063
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
 +#: 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: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:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
 +#: g10/keyedit.c:2263
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
 +#: 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:2275
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
 +#: g10/keyedit.c:2286
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
 +#: 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: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: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:2337
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
 +#: 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: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:2398
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
 +#: 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:2437
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
 +#: g10/keyedit.c:2458
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
 +#: 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:2510
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
 +#: 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: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:2556
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
 +#: g10/keyedit.c:2557
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
 +#: 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: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: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: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:2691
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
 +#: 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:2700
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
 +#: g10/keyedit.c:2774
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
 +#: g10/keyedit.c:2778
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
 +#: 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: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:3039
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
 +#: g10/keyedit.c:3084
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
 +#: 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:3249 g10/keyedit.c:3252
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
 +#: g10/keyedit.c:3255
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
 +#: g10/keyedit.c:3255
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
 +#: 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:3565
 +msgid "Features: "
 +msgstr "Features: "
 +
 +#: g10/keyedit.c:3576
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
 +#: g10/keyedit.c:3591 g10/keylist.c:374
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
 +#: g10/keyedit.c:3599 g10/keyedit.c:3600
 +msgid "Notations: "
 +msgstr "Notations: "
 +
 +#: 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: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: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:3947
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
 +#: 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:3992 g10/keylist.c:1849
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
 +#: g10/keyedit.c:3994 g10/keylist.c:1855
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
 +#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1861
 +#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
 +#: g10/keyedit.c:3998
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
 +#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
 +#: g10/keyedit.c:4065
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
 +#: g10/keyedit.c:4069
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
 +#: g10/keyedit.c:4076
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
 +#: 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
 +msgid "revoked"
 +msgstr "revoked"
 +
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
 +msgid "expired"
 +msgstr "expired"
 +
 +#: 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:4321
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
 +#: 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: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: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: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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
 +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:4509
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4519
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4523
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4530
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
 +#: 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:4550
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
 +msgid "invalid"
 +msgstr "invalid"
 +
 +#: g10/keyedit.c:4587
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\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] "User ID “%s”: %d signature removed\n"
 +msgstr[1] "User ID “%s”: %d signatures removed\n"
 +
 +#: g10/keyedit.c:4601
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
 +#: g10/keyedit.c:4602
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
 +#: 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: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:4699
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
 +#: 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: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: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: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: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: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:4853
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
 +#: 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: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:5085
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
 +#: 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:5206
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
 +#: 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:5418
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
 +#: 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: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:5557
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
 +#: g10/keyedit.c:5704
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
 +#: 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:5836
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
 +#: 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:5959
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
 +#: g10/keyedit.c:6100
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
 +#: 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:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
 +#: g10/keyedit.c:6109
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
 +#: 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:6119
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
 +#: g10/keyedit.c:6173
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
 +#: 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:6208
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
 +#: 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:6240
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
 +#: g10/keyedit.c:6263
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
 +#: g10/keyedit.c:6296
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
 +#: 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:6354
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
 +#: 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:6485
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
 +#: g10/keyedit.c:6547
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
 +#: 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:316
++#: g10/keygen.c:317
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:323
++#: g10/keygen.c:324
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:325
++#: g10/keygen.c:326
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:327
++#: g10/keygen.c:328
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:470
++#: g10/keygen.c:471
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:949
++#: g10/keygen.c:950
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:995
++#: g10/keygen.c:996
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
 +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:1691
++#: g10/keygen.c:1692
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
 +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:1719
++#: g10/keygen.c:1720
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
 +#, 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:2198
++#: g10/keygen.c:2183
 +#, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
 +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:2444
++#: g10/keygen.c:2429
 +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:2467
++#: g10/keygen.c:2452
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
 +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:2516
++#: g10/keygen.c:2501
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
 +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:2599
++#: g10/keygen.c:2584
 +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:2618
++#: g10/keygen.c:2603
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
 +#, 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:2632
++#: g10/keygen.c:2617
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
 +#, 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:2713
++#: g10/keygen.c:2698
 +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:2738
++#: g10/keygen.c:2723
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
 +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:2749
++#: g10/keygen.c:2734
 +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:2754
++#: g10/keygen.c:2739
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
 +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:2774
++#: g10/keygen.c:2759
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
 +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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
 +#, 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:3926
++#: g10/keygen.c:3912
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
 +#, 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:4360
++#: g10/keygen.c:4375
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
 +#, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
 +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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
 +#, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
 +#, 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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
 +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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
 +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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
 +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:330
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:332
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:372
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:425
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:427
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:469
 +#, 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:482
 +#, 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:564
 +#, 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:586
 +msgid "Keyring"
 +msgstr "Keyring"
 +
 +#: g10/keylist.c:1716
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
 +#: g10/keylist.c:1718
 +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:1726
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
 +#: g10/keylist.c:1728 g10/keylist.c:1738
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
 +#: g10/keylist.c:1733 g10/keylist.c:1749
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
 +#: g10/keylist.c:1800
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
 +#, 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
++#: g10/keyring.c:1602
 +#, 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
++#: g10/keyring.c:1604
 +#, 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
++#: g10/keyring.c:1679
 +#, 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:1238 g10/mainproc.c:1281
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
 +#: g10/mainproc.c:1612
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
 +#: g10/mainproc.c:1614
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
 +#: g10/mainproc.c:1616
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
 +#: g10/mainproc.c:1635
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
 +#: 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:1758 g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
 +#: 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: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:1777
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
 +#: g10/mainproc.c:1794
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
 +#: g10/mainproc.c:2029
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
 +#: g10/mainproc.c:2067
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
 +#: g10/mainproc.c:2150
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
 +#: g10/mainproc.c:2154
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
 +#: 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:2166
 +msgid "binary"
 +msgstr "binary"
 +
 +#: g10/mainproc.c:2167
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
 +msgid "unknown"
 +msgstr "unknown"
 +
 +#: g10/mainproc.c:2169
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
 +#: 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:2234
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
 +#: 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: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:2389
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
 +#: 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
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
 +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
++#: g10/passphrase.c:503
 +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
++#: g10/passphrase.c:508
 +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
++#: g10/passphrase.c:511
 +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
++#: g10/passphrase.c:516
 +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
++#: g10/passphrase.c:519
 +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
++#: g10/passphrase.c:528
 +#, 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:758
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
 +#: g10/pkclist.c:74 g10/revoke.c:760
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
 +#: 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:761
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
 +#: 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: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 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 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:1274
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
 +#: g10/pkclist.c:1219
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
 +#: g10/pkclist.c:1229
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
 +#: g10/pkclist.c:1264
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
 +#: g10/pkclist.c:1313
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
 +#: 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: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:614
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
 +#: g10/plaintext.c:622
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
 +#: g10/plaintext.c:659
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
 +#: g10/plaintext.c:704
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
 +#: 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: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
++#: g10/pubkey-enc.c:354
 +#, 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
++#: g10/pubkey-enc.c:387
 +#, 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
++#: g10/pubkey-enc.c:394
 +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: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 \"--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 “--generate-revocation” in the GnuPG manual."
 +
 +#: 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:591
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
 +#: 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:662
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
 +#: g10/revoke.c:689
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
 +#: 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: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:770
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
 +#: g10/revoke.c:780
 +msgid "Cancel"
 +msgstr "Cancel"
 +
 +#: 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: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:851
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
 +#: g10/revoke.c:853
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
 +#: 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:331
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
- #: g10/sign.c:880
++#: g10/sign.c:887
 +#, 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:1011
++#: g10/sign.c:1018
 +msgid "signing:"
 +msgstr "signing:"
 +
- #: g10/sign.c:1288
++#: g10/sign.c:1295
 +#, 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: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
++#: g10/tdbdump.c:221
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 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:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
 +#, 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: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: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: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:505
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
 +#: 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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
 +#: 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: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: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:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
 +#: 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: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] "The email address “%s” is associated with %d key!"
 +msgstr[1] "The email address “%s” is associated with %d keys!"
 +
 +#: 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: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:1605
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
 +#: g10/tofu.c:1615
 +msgid "This key's user IDs:\n"
 +msgstr "This key's user IDs:\n"
 +
 +#: g10/tofu.c:1631 g10/tofu.c:1796
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
 +#: g10/tofu.c:1722
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
 +#: 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: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:1785 g10/tofu.c:1790
 +msgid ", "
 +msgstr ", "
 +
 +#: g10/tofu.c:1794
 +msgid "this key"
 +msgstr "this key"
 +
 +#: 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 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:1835
 +#, c-format
 +msgid "Encrypted %d message in the future."
 +msgid_plural "Encrypted %d messages in the future."
 +msgstr[0] "Encrypted %d message in the future."
 +msgstr[1] "Encrypted %d messages in the future."
 +
 +#: g10/tofu.c:1849
 +#, c-format
 +msgid "Messages verified over the past %d day: %d."
 +msgid_plural "Messages verified over the past %d days: %d."
 +msgstr[0] "Messages verified over the past %d day: %d."
 +msgstr[1] "Messages verified over the past %d days: %d."
 +
 +#: g10/tofu.c:1855
 +#, c-format
 +msgid "Messages encrypted over the past %d day: %d."
 +msgid_plural "Messages encrypted over the past %d days: %d."
 +msgstr[0] "Messages encrypted over the past %d day: %d."
 +msgstr[1] "Messages encrypted over the past %d days: %d."
 +
 +#: g10/tofu.c:1865
 +#, c-format
 +msgid "Messages verified over the past %d month: %d."
 +msgid_plural "Messages verified over the past %d months: %d."
 +msgstr[0] "Messages verified over the past %d month: %d."
 +msgstr[1] "Messages verified over the past %d months: %d."
 +
 +#: g10/tofu.c: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: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:1958
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
 +#: 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:1972
- msgid "Defaulting to unknown."
- msgstr "Defaulting to unknown."
++msgid "Defaulting to unknown.\n"
++msgstr "Defaulting to unknown.\n"
 +
 +#: g10/tofu.c:2087 g10/tofu.c:2223
 +msgid "TOFU db corruption detected.\n"
 +msgstr "TOFU db corruption detected.\n"
 +
 +#: g10/tofu.c:2143
 +#, c-format
 +msgid "resetting keydb: %s\n"
 +msgstr "resetting keydb: %s\n"
 +
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
 +#, c-format
 +msgid "error setting TOFU binding's policy to %s\n"
 +msgstr "error setting TOFU binding's policy to %s\n"
 +
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
 +#, c-format
 +msgid "%lld~year"
 +msgid_plural "%lld~years"
 +msgstr[0] "%lld~year"
 +msgstr[1] "%lld~years"
 +
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
 +#, c-format
 +msgid "%lld~month"
 +msgid_plural "%lld~months"
 +msgstr[0] "%lld~month"
 +msgstr[1] "%lld~months"
 +
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
 +#, c-format
 +msgid "%lld~week"
 +msgid_plural "%lld~weeks"
 +msgstr[0] "%lld~week"
 +msgstr[1] "%lld~weeks"
 +
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
 +#, c-format
 +msgid "%lld~day"
 +msgid_plural "%lld~days"
 +msgstr[0] "%lld~day"
 +msgstr[1] "%lld~days"
 +
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
 +#, c-format
 +msgid "%lld~hour"
 +msgid_plural "%lld~hours"
 +msgstr[0] "%lld~hour"
 +msgstr[1] "%lld~hours"
 +
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
 +#, c-format
 +msgid "%lld~minute"
 +msgid_plural "%lld~minutes"
 +msgstr[0] "%lld~minute"
 +msgstr[1] "%lld~minutes"
 +
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
 +#, c-format
 +msgid "%lld~second"
 +msgid_plural "%lld~seconds"
 +msgstr[0] "%lld~second"
 +msgstr[1] "%lld~seconds"
 +
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
 +#, c-format
 +msgid "%s: Verified 0~signatures and encrypted 0~messages."
 +msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 +
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
 +#, c-format
 +msgid "%s: Verified 0 signatures."
 +msgstr "%s: Verified 0 signatures."
 +
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
 +#, c-format
 +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
++#: g10/tofu.c:3142
 +msgid "Encrypted 0 messages."
 +msgstr "Encrypted 0 messages."
 +
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
 +#, c-format
 +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:3146
++#: g10/tofu.c:3161
 +#, c-format
 +msgid "(policy: %s)"
 +msgstr "(policy: %s)"
 +
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
 +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:3180
++#: g10/tofu.c:3195
 +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:3184
++#: g10/tofu.c:3199
 +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:3187
++#: g10/tofu.c:3202
 +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:3216
++#: g10/tofu.c:3231
 +#, 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: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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
 +#, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
- msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++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:3819
++#: g10/tofu.c:3885
 +#, 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: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: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: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: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:475
++#: g10/trustdb.c:488
 +#, 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:481
++#: g10/trustdb.c:494
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
 +#, 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:549
++#: g10/trustdb.c:564
 +#, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
 +#, 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:1983
++#: g10/trustdb.c:2014
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
 +#, 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:2114
++#: g10/trustdb.c:2145
 +#, 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:2194
++#: g10/trustdb.c:2225
 +#, 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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
 +#, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
 +#, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 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:801
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
 +#: 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:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
++msgid "error retrieving CHV status from card\n"
++msgstr "error retrieving CHV status from card\n"
++
++#: scd/app-openpgp.c:1336
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
 +msgid "response does not contain the EC public key\n"
 +msgstr "response does not contain the EC public key\n"
 +
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
 +msgid "response does not contain the public key data\n"
 +msgstr "response does not contain the public key data\n"
 +
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
 +#, c-format
 +msgid "reading public key failed: %s\n"
 +msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1907
++#. TRANSLATORS: Put a \x1f right before a colon.  This can be
++#. * used by pinentry to nicely align the names and values.  Keep
++#. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
++#, c-format
++msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
++msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
++
++#: scd/app-openpgp.c:2005
++#, c-format
++msgid "%sNumber: %s%%0AHolder: %s%s"
++msgstr "%sNumber: %s%%0AHolder: %s%s"
++
++#. TRANSLATORS: This is the number of remaining attempts to
++#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
++#, c-format
++msgid "Remaining attempts: %d"
++msgstr "Remaining attempts: %d"
++
++#: scd/app-openpgp.c:2077
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
 +#, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
++#: scd/app-openpgp.c:2097
++msgid "||Please unlock the card"
++msgstr "||Please unlock the card"
 +
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
- msgstr "||Please enter the PIN"
- 
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
 +#, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "error retrieving CHV status from card\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
 +#, 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:2086
- #, 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:2090
++#. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
++msgid "||Please enter the PIN"
++msgstr "||Please enter the PIN"
++
++#: scd/app-openpgp.c:2619
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
 +#, 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:2497
++#: scd/app-openpgp.c:2652
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
 +#, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
 +#, 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:3853
++#: scd/app-openpgp.c:4008
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
 +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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
 +#, 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
 +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
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
 +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:789
 +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:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
 +#, 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
++#: sm/certchain.c:256 dirmngr/validate.c:144
 +#, 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
++#: sm/certchain.c:295 dirmngr/validate.c:242
 +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
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
 +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
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
 +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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
 +#, 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
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
 +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
++#: sm/certchain.c:1086 dirmngr/validate.c:526
 +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
++#: sm/certchain.c:1218 dirmngr/validate.c:577
 +#, 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
++#: sm/certchain.c:1515 dirmngr/validate.c:575
 +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
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
 +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
++#: sm/certcheck.c:244 sm/verify.c:209
 +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
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
 +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
++#: sm/certlist.c:122 dirmngr/validate.c:1111
 +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
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
 +#, 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
++#: sm/certlist.c:142 dirmngr/validate.c:1152
 +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
++#: sm/certlist.c:154 dirmngr/validate.c:1162
 +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
++#: sm/certlist.c:165 dirmngr/validate.c:1145
 +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
++#: sm/certlist.c:166 dirmngr/validate.c:1135
 +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
++#: sm/certlist.c:167 dirmngr/validate.c:1146
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
 +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
++#: sm/certreqgen.c:1328
 +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
++#: sm/certreqgen-ui.c:158
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
 +#, 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
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
 +#, 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
++#: sm/certreqgen-ui.c:320
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
 +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
++#: sm/certreqgen-ui.c:334
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
 +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
++#: sm/certreqgen-ui.c:419
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
 +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:219
 +msgid "import certificates"
 +msgstr "import certificates"
 +
 +#: sm/gpgsm.c:220
 +msgid "export certificates"
 +msgstr "export certificates"
 +
 +#: sm/gpgsm.c:228
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
 +#: sm/gpgsm.c:231
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
 +#: sm/gpgsm.c:233
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
 +#: sm/gpgsm.c:250
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
 +#: sm/gpgsm.c:258
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
 +#: sm/gpgsm.c:260
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
 +#: sm/gpgsm.c:262
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
 +#: sm/gpgsm.c:269
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
 +#: sm/gpgsm.c:279
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
 +#: sm/gpgsm.c:284
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
 +#: sm/gpgsm.c:287
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
 +#: sm/gpgsm.c:290
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
 +#: sm/gpgsm.c:294
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
 +#: sm/gpgsm.c:305
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
 +#: 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:312
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
 +#: sm/gpgsm.c:315
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
 +#: sm/gpgsm.c:316
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
 +#: sm/gpgsm.c:317
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
 +#: 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:323
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
 +#: sm/gpgsm.c:350
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
 +#: sm/gpgsm.c:352
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
 +#: sm/gpgsm.c:559
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
 +#: 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: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:777
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
 +#: 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: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:868 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
 +#: sm/gpgsm.c:1427
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
 +#: sm/gpgsm.c:1630
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
 +#: 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: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
++#: sm/import.c:472 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
++#: sm/import.c:531 sm/import.c:563
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 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
++#: sm/qualified.c:215 sm/verify.c:624
 +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
++#: sm/sign.c:454
 +#, 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
++#: sm/sign.c:468
 +#, 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
++#: sm/sign.c:520
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
- #: sm/verify.c:450
++#: sm/verify.c:457
 +msgid "Signature made "
 +msgstr "Signature made "
 +
- #: sm/verify.c:454
++#: sm/verify.c:461
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
- #: sm/verify.c:455
++#: sm/verify.c:462
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
- #: sm/verify.c:474
++#: sm/verify.c:481
 +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
++#: sm/verify.c:602
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
- #: sm/verify.c:596
++#: sm/verify.c:603
 +msgid "                aka"
 +msgstr "                aka"
 +
- #: sm/verify.c:614
++#: sm/verify.c:621
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
 +#, 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
++#: dirmngr/certcache.c:142
 +#, 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
++#: dirmngr/certcache.c:153
 +#, 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
++#: dirmngr/certcache.c:293
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
 +msgid "  subject ="
 +msgstr "  subject ="
 +
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
++#, c-format
++msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
++msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
++
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
 +#, 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
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
 +#, 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
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
 +#, 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
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
 +#, 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
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
 +#, 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
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
 +#, 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
++#: dirmngr/crlcache.c:1860
 +#, 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
++#: dirmngr/crlcache.c:2003
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
 +#, 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
++#: dirmngr/crlcache.c:2058
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
 +#, 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
++#: dirmngr/crlcache.c:2114
 +#, 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
++#: dirmngr/crlcache.c:2130
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
 +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
++#: dirmngr/crlcache.c:2274
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
 +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
++#: dirmngr/crlcache.c:2300
 +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
++#: dirmngr/crlcache.c:2303
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
 +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
++#: dirmngr/crlcache.c:2328
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
 +#, 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
++#: dirmngr/crlfetch.c:183
 +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
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
 +#, 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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
 +#, 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
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
 +#, 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
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
 +#, 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:160
++#: dirmngr/dirmngr.c:162
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
 +msgid "allow online software version check"
 +msgstr "allow online software version check"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
 +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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
 +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:223
++#: dirmngr/dirmngr.c:225
 +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:225
++#: dirmngr/dirmngr.c:227
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
 +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:361
++#: dirmngr/dirmngr.c:381
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
 +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:443
++#: dirmngr/dirmngr.c:463
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
 +#, 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:1563
 +#, 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:1618 dirmngr/dirmngr.c:1702
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
 +#, 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:1776
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
 +#, 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:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
 +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
++#: dirmngr/misc.c:172
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
 +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
++#: dirmngr/ocsp.c:182
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
 +#, 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
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
 +#, 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
++#: dirmngr/ocsp.c:329
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
 +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
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
 +#, 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
++#: dirmngr/ocsp.c:677
 +#, 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
++#: dirmngr/ocsp.c:702
 +#, 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
++#: dirmngr/ocsp.c:703
 +msgid "good"
 +msgstr "good"
 +
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
 +#, 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
++#: dirmngr/ocsp.c:744
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
 +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
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
 +#, 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:2583
++#: dirmngr/server.c:2651
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
 +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
++#: dirmngr/validate.c:1169
 +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: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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
 +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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
 +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
++#: tools/gpgconf-comp.c:537
 +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
++#: tools/gpgconf-comp.c:561
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
 +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
++#: tools/gpgconf-comp.c:572
 +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
++#: tools/gpgconf-comp.c:576
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
 +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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
 +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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
 +msgid "OpenPGP"
 +msgstr "OpenPGP"
 +
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
 +msgid "Private Keys"
 +msgstr "Private Keys"
 +
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
 +msgid "Smartcards"
 +msgstr "Smartcards"
 +
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
 +msgid "S/MIME"
 +msgstr "S/MIME"
 +
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
 +msgid "Network"
 +msgstr "Network"
 +
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
 +msgid "Passphrase Entry"
 +msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
 +#, c-format
 +msgid "error closing '%s'\n"
 +msgstr "error closing ‘%s’\n"
 +
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
 +#, 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:74
 +msgid "check all programs"
 +msgstr "check all programs"
 +
 +#: tools/gpgconf.c:75
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
 +#: tools/gpgconf.c:76
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
 +#: tools/gpgconf.c:77
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
 +#: tools/gpgconf.c:79
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
 +#: 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:85
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
 +#: tools/gpgconf.c:87
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
 +#: tools/gpgconf.c:89
 +msgid "query the software version database"
 +msgstr "query the software version database"
 +
 +#: tools/gpgconf.c:90
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
 +#: tools/gpgconf.c:91
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
 +#: tools/gpgconf.c:92
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
 +#: tools/gpgconf.c:98
 +msgid "use as output file"
 +msgstr "use as output file"
 +
 +#: tools/gpgconf.c:102
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
 +#: tools/gpgconf.c:127
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
 +#: 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:553 tools/gpgconf.c:588
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
 +#: tools/gpgconf.c:562 tools/gpgconf.c:612 tools/gpgconf.c:645
 +msgid "Component not found"
 +msgstr "Component not found"
 +
 +#: tools/gpgconf.c:671
 +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 4fb5280,0000000..85443b0
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10664 -1,0 +1,10690 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2017 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2017.
 +#
 +# 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.18\n"
++"Project-Id-Version: GNU gnupg 2.1.19\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
++"PO-Revision-Date: 2017-03-01 16:34+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
++#: agent/call-pinentry.c:296
 +#, 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
++#: agent/call-pinentry.c:499
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
 +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
++#: agent/call-pinentry.c:507
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
 +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
++#: agent/call-pinentry.c:840
 +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
++#: agent/call-pinentry.c:861
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
 +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
++#: agent/call-pinentry.c:992
 +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
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +msgid "PIN:"
 +msgstr "PIN:"
 +
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: 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
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 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
++#: agent/call-pinentry.c:1076
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
 +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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
 +#, 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
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
 +#, 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
++#: agent/command-ssh.c:2448
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
 +#, 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
++#: agent/command-ssh.c:2473
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
++#, c-format
++msgid "error getting list of cards: %s\n"
++msgstr "error getting list of cards: %s\n"
++
++#: agent/command-ssh.c:2775
 +#, 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
++#: agent/command-ssh.c:2782
 +msgid "Allow"
 +msgstr "Allow"
 +
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
 +msgid "Deny"
 +msgstr "Deny"
 +
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
 +#, 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
++#: agent/command-ssh.c:3030 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
 +#, 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
++#: agent/command-ssh.c:3617
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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:210
++#: agent/divert-scd.c:244
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
 +msgid "PUK"
 +msgstr "PUK"
 +
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
 +#, 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:297
++#: agent/divert-scd.c:354
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
 +#, 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
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
 +#, 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:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
 +msgid "run in supervised mode"
 +msgstr "run in supervised mode"
 +
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
 +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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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:492
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
 +#: agent/gpg-agent.c:494
 +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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
 +#: agent/gpg-agent.c:2147
 +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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
 +#: agent/gpg-agent.c:2203 agent/gpg-agent.c:2246 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:2206 agent/gpg-agent.c:2251 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:2257
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
 +#: agent/gpg-agent.c:2261
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
 +#: agent/gpg-agent.c:2611
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
 +#: agent/gpg-agent.c:2616
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
 +#: agent/gpg-agent.c:2691
 +#, 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:2696
 +#, 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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
 +#: agent/gpg-agent.c:3104 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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: 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
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: 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
++#: agent/findkey.c:1460
 +#, 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
++#: agent/findkey.c:1484 agent/findkey.c:1498
 +msgid "Delete key"
 +msgstr "Delete key"
 +
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
 +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
++#: agent/pksign.c:517
 +#, 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: 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:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
 +#, 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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
 +#, 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:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 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:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
 +#, c-format
 +msgid "waiting for processes to terminate failed: %s\n"
 +msgstr "waiting for processes to terminate failed: %s\n"
 +
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 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:148
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
 +#: 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:282
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
 +#: 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: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: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:3102
++#: scd/app-openpgp.c:3257
 +#, 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/ksba-io-support.c:338
++#, c-format
++msgid "invalid radix64 character %02x skipped\n"
++msgstr "invalid radix64 character %02x skipped\n"
++
 +#: 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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
 +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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
 +#, 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: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: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:1306
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
 +#: 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: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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
 +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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
 +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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 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:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: 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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
 +#, 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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
 +#, c-format
 +msgid "%s keysizes must be in the range %u-%u\n"
 +msgstr "%s keysizes must be in the range %u-%u\n"
 +
 +#: g10/card-util.c: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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 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: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: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:2817
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
 +#: 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:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
 +#, 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: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:986
++#: g10/encrypt.c:707 g10/sign.c:993
 +#, 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: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:120
 +msgid "use the GnuPG key backup format"
 +msgstr "use the GnuPG key backup format"
 +
- #: g10/export.c:1232
++#: g10/export.c:1235
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
- #: g10/export.c:1691
++#: g10/export.c:1694
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
- #: g10/export.c:1877
++#: g10/export.c:1880
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
- #: g10/export.c:1954
++#: g10/export.c:1957
 +#, 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:2042
++#: g10/export.c:2043
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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: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:426 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
 +#: g10/gpg.c:427
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
 +#: g10/gpg.c:429 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
 +#: g10/gpg.c:430 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
 +#: g10/gpg.c:432
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
 +#: g10/gpg.c:434 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
 +#: g10/gpg.c:436 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
 +#: g10/gpg.c:438 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
 +#: g10/gpg.c:440
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
 +#: g10/gpg.c:443
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
 +#: g10/gpg.c:445 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
 +#: g10/gpg.c:446 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
 +#: g10/gpg.c:448 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
 +#: g10/gpg.c:451
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
 +#: g10/gpg.c:454
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
 +#: g10/gpg.c:459
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
 +#: 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:467
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
 +#: 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:472
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
 +#: g10/gpg.c:474
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
 +#: g10/gpg.c:476
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
 +#: g10/gpg.c:477
 +msgid "sign a key"
 +msgstr "sign a key"
 +
 +#: g10/gpg.c:478
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
 +#: g10/gpg.c:479
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
 +#: g10/gpg.c:481 sm/gpgsm.c:234
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
 +#: g10/gpg.c:485
 +msgid "export keys"
 +msgstr "export keys"
 +
 +#: g10/gpg.c:486
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
 +#: g10/gpg.c:487
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
 +#: g10/gpg.c:490
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
 +#: g10/gpg.c:492
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
 +#: g10/gpg.c:498
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
 +#: g10/gpg.c:501
 +msgid "print the card status"
 +msgstr "print the card status"
 +
 +#: g10/gpg.c:502
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
 +#: g10/gpg.c:504
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
 +#: g10/gpg.c:516
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
 +#: g10/gpg.c:525
 +msgid "print message digests"
 +msgstr "print message digests"
 +
 +#: g10/gpg.c:528 sm/gpgsm.c:229
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
 +#: 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:534 sm/gpgsm.c:248
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
 +#: 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: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:559
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
 +#: g10/gpg.c:566
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
 +#: 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:599
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
 +#: g10/gpg.c:648
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
 +#: 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:677
 +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"
 +msgstr ""
 +"@\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:1047
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
 +#: 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:1061 sm/gpgsm.c:580
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
 +#: g10/gpg.c:1064
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
 +#: g10/gpg.c:1071 g10/keyedit.c:3483
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
 +#: g10/gpg.c:1078
 +msgid "Hash: "
 +msgstr "Hash: "
 +
 +#: g10/gpg.c:1085 g10/keyedit.c:3532
 +msgid "Compression: "
 +msgstr "Compression: "
 +
 +#: 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:1342 sm/gpgsm.c:743
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
 +#: 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:1558
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
 +#: 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:1564
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
 +#: 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:1573
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
 +#: 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: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: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: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: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: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: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:1816
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
 +#, c-format
 +msgid "valid values for option '%s':\n"
 +msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
 +#, c-format
 +msgid "invalid value for option '%s'\n"
 +msgstr "invalid value for option ‘%s’\n"
 +
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
 +#, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
 +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:3735
++#: g10/gpg.c:3739
 +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:3737
++#: g10/gpg.c:3741
 +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:3740
++#: g10/gpg.c:3744
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
 +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:3751
++#: g10/gpg.c:3755
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
 +#, 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:3851
++#: g10/gpg.c:3855
 +#, 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:3856
++#: g10/gpg.c:3860
 +#, 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:3955
++#: g10/gpg.c:3959
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
 +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:4038
++#: g10/gpg.c:4042
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
 +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:4070
++#: g10/gpg.c:4074
 +#, 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:4127
++#: g10/gpg.c:4131
 +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:4130
++#: g10/gpg.c:4134
 +#, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
 +#, 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:4904
++#: g10/gpg.c:4901
++msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
++msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
++
++#: g10/gpg.c:4912
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
 +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:152
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
 +#: 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:158
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
 +#: g10/import.c:161
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
 +#: g10/import.c:164
 +msgid "show key during import"
 +msgstr "show key during import"
 +
 +#: g10/import.c:167
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
 +#: g10/import.c:170
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
 +#: 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:176
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
 +#: g10/import.c:179
 +msgid "assume the GnuPG key backup format"
 +msgstr "assume the GnuPG key backup format"
 +
 +#: g10/import.c:341 g10/import.c:583
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
 +#: g10/import.c:600
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
 +#: g10/import.c:670
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
 +#: g10/import.c:673
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
 +#: g10/import.c:675
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
 +#: g10/import.c:678
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
 +#: g10/import.c:681 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
 +#: g10/import.c:685 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
 +#: g10/import.c:687
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
 +#: g10/import.c:689
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
 +#: g10/import.c:691
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
 +#: g10/import.c:693
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
 +#: g10/import.c:695 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
 +#: g10/import.c:697 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
 +#: g10/import.c:699 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
 +#: g10/import.c:701 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
 +#: g10/import.c:703
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
 +#: g10/import.c:705
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
 +#: g10/import.c:1052
 +#, 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:1094
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
 +#: g10/import.c:1109
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
 +#: g10/import.c:1121
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
 +#: g10/import.c:1134
 +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:1136
 +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:1161
 +#, 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:1397 g10/import.c:2185
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
 +#: g10/import.c:1403
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
 +#: g10/import.c:1404 g10/import.c:2159
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
 +#: g10/import.c:1434
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
 +#: g10/import.c:1452
 +#, 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:1462 g10/import.c:1493
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
 +#: g10/import.c:1464
 +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:1534 g10/import.c:2336
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
 +#: g10/import.c:1540
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
 +#: g10/import.c:1555
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
 +#: g10/import.c:1564 g10/import.c:1665 g10/import.c:2402
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
 +#: g10/import.c:1584
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
 +#: g10/import.c:1608
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
 +#: g10/import.c:1624 g10/import.c:2360
 +#, 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:1632 g10/import.c:2367
 +#, 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:1675
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
 +#: g10/import.c:1678
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
 +#: g10/import.c:1681
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
 +#: g10/import.c:1684
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
 +#: g10/import.c:1687
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
 +#: g10/import.c:1690
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
 +#: g10/import.c:1693
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
 +#: g10/import.c:1696
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
 +#: g10/import.c:1699
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
 +#: g10/import.c:1702
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
 +#: g10/import.c:1725
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
 +#: g10/import.c:2037 g10/import.c:2282
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
 +#: g10/import.c:2045
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
 +#: g10/import.c:2053
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
 +#: g10/import.c:2158
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
 +#: g10/import.c:2178 g10/import.c:2213
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
 +#: g10/import.c:2202
 +#, 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:2274
 +#, 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:2329
 +#, 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:2378
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
 +#: g10/import.c:2411
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
 +#: g10/import.c:2487
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
 +#: g10/import.c:2504
 +#, 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:2506
 +#, 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:2523 g10/import.c:2549 g10/import.c:2600
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
 +#: g10/import.c:2524
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
 +#: g10/import.c:2538
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
 +#: g10/import.c:2551
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
 +#: g10/import.c:2567
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
 +#: g10/import.c:2589
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
 +#: g10/import.c:2602
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
 +#: g10/import.c:2617
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
 +#: g10/import.c:2659
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
 +#: g10/import.c:2683
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
 +#: g10/import.c:2712
 +#, 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:2723
 +#, 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:2741
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
 +#: g10/import.c:2755
 +#, 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:2763
 +#, 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:2905
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
 +#: g10/import.c:2969
 +#, 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:2985
 +#, 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:3049
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
 +#: g10/import.c:3087
 +#, 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:1786
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
 +#: g10/keyedit.c:265
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
 +#: g10/keyedit.c:265
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
 +#: 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: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: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:801
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
 +#: g10/keyedit.c:914
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
 +#: 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:920 g10/keylist.c:477
 +#, 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:924 g10/keylist.c:473
 +#, 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: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: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: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:997 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
 +#: 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: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: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: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:1169
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
 +#: 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: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:1197
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
 +#: 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:1254
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
 +#: g10/keyedit.c:1256
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
 +#: 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: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: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: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: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: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: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:1360
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
 +#: 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:1387
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
 +#: g10/keyedit.c:1411
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
 +#: 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: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: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:1481
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
 +#: 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:1485
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
 +#: 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:1495
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
 +#: 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:1530
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
 +#: 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: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:1552
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
 +#: 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:1566
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
 +#: g10/keyedit.c:1571
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
 +#: 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:1588
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
 +#: 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: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:1756
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
 +#: g10/keyedit.c:1870
 +msgid "save and quit"
 +msgstr "save and quit"
 +
 +#: g10/keyedit.c:1873
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
 +#: g10/keyedit.c:1874
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
 +#: g10/keyedit.c:1875
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
 +#: g10/keyedit.c:1877
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
 +#: g10/keyedit.c:1878
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
 +#: g10/keyedit.c:1879
 +msgid "check signatures"
 +msgstr "check signatures"
 +
 +#: 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:1890
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
 +#: 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:1893
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
 +#: g10/keyedit.c:1895
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
 +#: g10/keyedit.c:1897
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
 +#: g10/keyedit.c:1898
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
 +#: g10/keyedit.c:1901
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
 +#: g10/keyedit.c:1904
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
 +#: g10/keyedit.c:1906
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
 +#: g10/keyedit.c:1908
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
 +#: g10/keyedit.c:1910
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
 +#: g10/keyedit.c:1912
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
 +#: g10/keyedit.c:1914
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
 +#: 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:1918
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
 +#: g10/keyedit.c:1921
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
 +#: g10/keyedit.c:1922
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
 +#: 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: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:1929
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
 +#: g10/keyedit.c:1931
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
 +#: g10/keyedit.c:1934
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
 +#: g10/keyedit.c:1937
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
 +#: g10/keyedit.c:1939
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
 +#: g10/keyedit.c:1942
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
 +#: g10/keyedit.c:1944
 +msgid "enable key"
 +msgstr "enable key"
 +
 +#: g10/keyedit.c:1945
 +msgid "disable key"
 +msgstr "disable key"
 +
 +#: g10/keyedit.c:1947
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
 +#: 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: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:2063
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
 +#: 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: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:2240 g10/keyedit.c:3178 g10/keyedit.c:3317 g10/keyedit.c:3379
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
 +#: g10/keyedit.c:2263
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
 +#: 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:2275
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
 +#: g10/keyedit.c:2286
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
 +#: 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: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: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:2337
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
 +#: 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: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:2398
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
 +#: 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:2437
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
 +#: g10/keyedit.c:2458
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
 +#: 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:2510
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
 +#: 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: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:2556
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
 +#: g10/keyedit.c:2557
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
 +#: 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: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: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: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:2691
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
 +#: 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:2700
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
 +#: g10/keyedit.c:2774
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
 +#: g10/keyedit.c:2778
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
 +#: 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: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:3039
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
 +#: g10/keyedit.c:3084
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
 +#: 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:3249 g10/keyedit.c:3252
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
 +#: g10/keyedit.c:3255
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
 +#: g10/keyedit.c:3255
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
 +#: 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:3565
 +msgid "Features: "
 +msgstr "Features: "
 +
 +#: g10/keyedit.c:3576
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
 +#: g10/keyedit.c:3591 g10/keylist.c:374
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
 +#: g10/keyedit.c:3599 g10/keyedit.c:3600
 +msgid "Notations: "
 +msgstr "Notations: "
 +
 +#: 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: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: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:3947
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
 +#: 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:3992 g10/keylist.c:1849
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
 +#: g10/keyedit.c:3994 g10/keylist.c:1855
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
 +#: g10/keyedit.c:3996 g10/keyedit.c:4133 g10/keylist.c:264 g10/keylist.c:1861
 +#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
 +#: g10/keyedit.c:3998
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
 +#: g10/keyedit.c:4006 g10/keyedit.c:4026 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
 +#: g10/keyedit.c:4065
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
 +#: g10/keyedit.c:4069
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
 +#: g10/keyedit.c:4076
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
 +#: 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
 +msgid "revoked"
 +msgstr "revoked"
 +
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
 +msgid "expired"
 +msgstr "expired"
 +
 +#: 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:4321
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
 +#: 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: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: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: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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
 +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:4509
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4519
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4523
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
 +#: g10/keyedit.c:4530
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
 +#: 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:4550
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
 +msgid "invalid"
 +msgstr "invalid"
 +
 +#: g10/keyedit.c:4587
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\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] "User ID “%s”: %d signature removed\n"
 +msgstr[1] "User ID “%s”: %d signatures removed\n"
 +
 +#: g10/keyedit.c:4601
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
 +#: g10/keyedit.c:4602
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
 +#: 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: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:4699
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
 +#: 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: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: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: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: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: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:4853
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
 +#: 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: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:5085
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
 +#: 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:5206
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
 +#: 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:5418
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
 +#: 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: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:5557
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
 +#: g10/keyedit.c:5704
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
 +#: 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:5836
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
 +#: 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:5959
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
 +#: g10/keyedit.c:6100
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
 +#: 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:6105 g10/keyedit.c:6207 g10/keyedit.c:6255
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
 +#: g10/keyedit.c:6109
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
 +#: 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:6119
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
 +#: g10/keyedit.c:6173
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
 +#: 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:6208
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
 +#: 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:6240
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
 +#: g10/keyedit.c:6263
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
 +#: g10/keyedit.c:6296
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
 +#: 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:6354
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
 +#: 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:6485
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
 +#: g10/keyedit.c:6547
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
 +#: 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:316
++#: g10/keygen.c:317
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:323
++#: g10/keygen.c:324
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:325
++#: g10/keygen.c:326
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:327
++#: g10/keygen.c:328
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:470
++#: g10/keygen.c:471
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:949
++#: g10/keygen.c:950
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:995
++#: g10/keygen.c:996
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
 +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:1691
++#: g10/keygen.c:1692
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
 +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:1719
++#: g10/keygen.c:1720
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
 +#, 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:2198
++#: g10/keygen.c:2183
 +#, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
 +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:2444
++#: g10/keygen.c:2429
 +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:2467
++#: g10/keygen.c:2452
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
 +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:2516
++#: g10/keygen.c:2501
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
 +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:2599
++#: g10/keygen.c:2584
 +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:2618
++#: g10/keygen.c:2603
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
 +#, 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:2632
++#: g10/keygen.c:2617
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
 +#, 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:2713
++#: g10/keygen.c:2698
 +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:2738
++#: g10/keygen.c:2723
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
 +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:2749
++#: g10/keygen.c:2734
 +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:2754
++#: g10/keygen.c:2739
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
 +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:2774
++#: g10/keygen.c:2759
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
 +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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
 +#, 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:3926
++#: g10/keygen.c:3912
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
 +#, 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:4360
++#: g10/keygen.c:4375
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
 +#, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
 +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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
 +#, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
 +#, 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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
 +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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
 +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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
 +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:330
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:332
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:372
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:425
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:427
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:469
 +#, 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:482
 +#, 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:564
 +#, 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:586
 +msgid "Keyring"
 +msgstr "Keyring"
 +
 +#: g10/keylist.c:1716
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
 +#: g10/keylist.c:1718
 +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:1726
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
 +#: g10/keylist.c:1728 g10/keylist.c:1738
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
 +#: g10/keylist.c:1733 g10/keylist.c:1749
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
 +#: g10/keylist.c:1800
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
 +#, 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
++#: g10/keyring.c:1602
 +#, 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
++#: g10/keyring.c:1604
 +#, 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
++#: g10/keyring.c:1679
 +#, 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:1238 g10/mainproc.c:1281
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
 +#: g10/mainproc.c:1612
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
 +#: g10/mainproc.c:1614
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
 +#: g10/mainproc.c:1616
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
 +#: g10/mainproc.c:1635
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
 +#: 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:1758 g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
 +#: 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: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:1777
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
 +#: g10/mainproc.c:1794
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
 +#: g10/mainproc.c:2029
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
 +#: g10/mainproc.c:2067
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
 +#: g10/mainproc.c:2150
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
 +#: g10/mainproc.c:2154
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
 +#: 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:2166
 +msgid "binary"
 +msgstr "binary"
 +
 +#: g10/mainproc.c:2167
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
 +msgid "unknown"
 +msgstr "unknown"
 +
 +#: g10/mainproc.c:2169
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
 +#: 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:2234
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
 +#: 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: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:2389
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
 +#: 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
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
 +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
++#: g10/passphrase.c:503
 +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
++#: g10/passphrase.c:508
 +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
++#: g10/passphrase.c:511
 +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
++#: g10/passphrase.c:516
 +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
++#: g10/passphrase.c:519
 +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
++#: g10/passphrase.c:528
 +#, 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:758
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
 +#: g10/pkclist.c:74 g10/revoke.c:760
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
 +#: 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:761
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
 +#: 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: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 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 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:1274
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
 +#: g10/pkclist.c:1219
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
 +#: g10/pkclist.c:1229
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
 +#: g10/pkclist.c:1264
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
 +#: g10/pkclist.c:1313
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
 +#: 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: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:614
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
 +#: g10/plaintext.c:622
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
 +#: g10/plaintext.c:659
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
 +#: g10/plaintext.c:704
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
 +#: 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: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
++#: g10/pubkey-enc.c:354
 +#, 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
++#: g10/pubkey-enc.c:387
 +#, 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
++#: g10/pubkey-enc.c:394
 +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: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 \"--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 “--generate-revocation” in the GnuPG manual."
 +
 +#: 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:591
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
 +#: 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:662
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
 +#: g10/revoke.c:689
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
 +#: 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: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:770
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
 +#: g10/revoke.c:780
 +msgid "Cancel"
 +msgstr "Cancel"
 +
 +#: 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: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:851
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
 +#: g10/revoke.c:853
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
 +#: 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:331
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
- #: g10/sign.c:880
++#: g10/sign.c:887
 +#, 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:1011
++#: g10/sign.c:1018
 +msgid "signing:"
 +msgstr "signing:"
 +
- #: g10/sign.c:1288
++#: g10/sign.c:1295
 +#, 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: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
++#: g10/tdbdump.c:221
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 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:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
 +#, 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: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: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: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:505
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
 +#: 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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
 +#: 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: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: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:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
 +#: 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: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] "The email address “%s” is associated with %d key!"
 +msgstr[1] "The email address “%s” is associated with %d keys!"
 +
 +#: 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: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:1605
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
 +#: g10/tofu.c:1615
 +msgid "This key's user IDs:\n"
 +msgstr "This key's user IDs:\n"
 +
 +#: g10/tofu.c:1631 g10/tofu.c:1796
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
 +#: g10/tofu.c:1722
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
 +#: 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: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:1785 g10/tofu.c:1790
 +msgid ", "
 +msgstr ", "
 +
 +#: g10/tofu.c:1794
 +msgid "this key"
 +msgstr "this key"
 +
 +#: 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 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:1835
 +#, c-format
 +msgid "Encrypted %d message in the future."
 +msgid_plural "Encrypted %d messages in the future."
 +msgstr[0] "Encrypted %d message in the future."
 +msgstr[1] "Encrypted %d messages in the future."
 +
 +#: g10/tofu.c:1849
 +#, c-format
 +msgid "Messages verified over the past %d day: %d."
 +msgid_plural "Messages verified over the past %d days: %d."
 +msgstr[0] "Messages verified over the past %d day: %d."
 +msgstr[1] "Messages verified over the past %d days: %d."
 +
 +#: g10/tofu.c:1855
 +#, c-format
 +msgid "Messages encrypted over the past %d day: %d."
 +msgid_plural "Messages encrypted over the past %d days: %d."
 +msgstr[0] "Messages encrypted over the past %d day: %d."
 +msgstr[1] "Messages encrypted over the past %d days: %d."
 +
 +#: g10/tofu.c:1865
 +#, c-format
 +msgid "Messages verified over the past %d month: %d."
 +msgid_plural "Messages verified over the past %d months: %d."
 +msgstr[0] "Messages verified over the past %d month: %d."
 +msgstr[1] "Messages verified over the past %d months: %d."
 +
 +#: g10/tofu.c: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: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:1958
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
 +#: 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:1972
- msgid "Defaulting to unknown."
- msgstr "Defaulting to unknown."
++msgid "Defaulting to unknown.\n"
++msgstr "Defaulting to unknown.\n"
 +
 +#: g10/tofu.c:2087 g10/tofu.c:2223
 +msgid "TOFU db corruption detected.\n"
 +msgstr "TOFU db corruption detected.\n"
 +
 +#: g10/tofu.c:2143
 +#, c-format
 +msgid "resetting keydb: %s\n"
 +msgstr "resetting keydb: %s\n"
 +
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
 +#, c-format
 +msgid "error setting TOFU binding's policy to %s\n"
 +msgstr "error setting TOFU binding's policy to %s\n"
 +
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
 +#, c-format
 +msgid "%lld~year"
 +msgid_plural "%lld~years"
 +msgstr[0] "%lld~year"
 +msgstr[1] "%lld~years"
 +
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
 +#, c-format
 +msgid "%lld~month"
 +msgid_plural "%lld~months"
 +msgstr[0] "%lld~month"
 +msgstr[1] "%lld~months"
 +
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
 +#, c-format
 +msgid "%lld~week"
 +msgid_plural "%lld~weeks"
 +msgstr[0] "%lld~week"
 +msgstr[1] "%lld~weeks"
 +
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
 +#, c-format
 +msgid "%lld~day"
 +msgid_plural "%lld~days"
 +msgstr[0] "%lld~day"
 +msgstr[1] "%lld~days"
 +
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
 +#, c-format
 +msgid "%lld~hour"
 +msgid_plural "%lld~hours"
 +msgstr[0] "%lld~hour"
 +msgstr[1] "%lld~hours"
 +
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
 +#, c-format
 +msgid "%lld~minute"
 +msgid_plural "%lld~minutes"
 +msgstr[0] "%lld~minute"
 +msgstr[1] "%lld~minutes"
 +
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
 +#, c-format
 +msgid "%lld~second"
 +msgid_plural "%lld~seconds"
 +msgstr[0] "%lld~second"
 +msgstr[1] "%lld~seconds"
 +
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
 +#, c-format
 +msgid "%s: Verified 0~signatures and encrypted 0~messages."
 +msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 +
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
 +#, c-format
 +msgid "%s: Verified 0 signatures."
 +msgstr "%s: Verified 0 signatures."
 +
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
 +#, c-format
 +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
++#: g10/tofu.c:3142
 +msgid "Encrypted 0 messages."
 +msgstr "Encrypted 0 messages."
 +
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
 +#, c-format
 +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:3146
++#: g10/tofu.c:3161
 +#, c-format
 +msgid "(policy: %s)"
 +msgstr "(policy: %s)"
 +
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
 +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:3180
++#: g10/tofu.c:3195
 +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:3184
++#: g10/tofu.c:3199
 +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:3187
++#: g10/tofu.c:3202
 +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:3216
++#: g10/tofu.c:3231
 +#, 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: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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
 +#, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
- msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++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:3819
++#: g10/tofu.c:3885
 +#, 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: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: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: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: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:475
++#: g10/trustdb.c:488
 +#, 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:481
++#: g10/trustdb.c:494
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
 +#, 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:549
++#: g10/trustdb.c:564
 +#, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
 +#, 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:1983
++#: g10/trustdb.c:2014
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
 +#, 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:2114
++#: g10/trustdb.c:2145
 +#, 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:2194
++#: g10/trustdb.c:2225
 +#, 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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
 +#, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
 +#, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 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:801
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
 +#: 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:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
++msgid "error retrieving CHV status from card\n"
++msgstr "error retrieving CHV status from card\n"
++
++#: scd/app-openpgp.c:1336
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
 +msgid "response does not contain the EC public key\n"
 +msgstr "response does not contain the EC public key\n"
 +
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
 +msgid "response does not contain the public key data\n"
 +msgstr "response does not contain the public key data\n"
 +
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
 +#, c-format
 +msgid "reading public key failed: %s\n"
 +msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1907
++#. TRANSLATORS: Put a \x1f right before a colon.  This can be
++#. * used by pinentry to nicely align the names and values.  Keep
++#. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
++#, c-format
++msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
++msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
++
++#: scd/app-openpgp.c:2005
++#, c-format
++msgid "%sNumber: %s%%0AHolder: %s%s"
++msgstr "%sNumber: %s%%0AHolder: %s%s"
++
++#. TRANSLATORS: This is the number of remaining attempts to
++#. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
++#, c-format
++msgid "Remaining attempts: %d"
++msgstr "Remaining attempts: %d"
++
++#: scd/app-openpgp.c:2077
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
 +#, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
++#: scd/app-openpgp.c:2097
++msgid "||Please unlock the card"
++msgstr "||Please unlock the card"
 +
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
- msgstr "||Please enter the PIN"
- 
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
 +#, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "error retrieving CHV status from card\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
 +#, 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:2086
- #, 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:2090
++#. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
++msgid "||Please enter the PIN"
++msgstr "||Please enter the PIN"
++
++#: scd/app-openpgp.c:2619
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
 +#, 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:2497
++#: scd/app-openpgp.c:2652
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
 +#, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
 +#, 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:3853
++#: scd/app-openpgp.c:4008
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
 +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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
 +#, 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
 +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
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
 +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:789
 +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:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
 +#, 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
++#: sm/certchain.c:256 dirmngr/validate.c:144
 +#, 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
++#: sm/certchain.c:295 dirmngr/validate.c:242
 +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
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
 +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
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
 +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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
 +#, 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
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
 +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
++#: sm/certchain.c:1086 dirmngr/validate.c:526
 +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
++#: sm/certchain.c:1218 dirmngr/validate.c:577
 +#, 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
++#: sm/certchain.c:1515 dirmngr/validate.c:575
 +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
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
 +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
++#: sm/certcheck.c:244 sm/verify.c:209
 +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
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
 +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
++#: sm/certlist.c:122 dirmngr/validate.c:1111
 +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
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
 +#, 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
++#: sm/certlist.c:142 dirmngr/validate.c:1152
 +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
++#: sm/certlist.c:154 dirmngr/validate.c:1162
 +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
++#: sm/certlist.c:165 dirmngr/validate.c:1145
 +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
++#: sm/certlist.c:166 dirmngr/validate.c:1135
 +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
++#: sm/certlist.c:167 dirmngr/validate.c:1146
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
 +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
++#: sm/certreqgen.c:1328
 +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
++#: sm/certreqgen-ui.c:158
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
 +#, 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
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
 +#, 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
++#: sm/certreqgen-ui.c:320
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
 +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
++#: sm/certreqgen-ui.c:334
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
 +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
++#: sm/certreqgen-ui.c:419
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
 +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:219
 +msgid "import certificates"
 +msgstr "import certificates"
 +
 +#: sm/gpgsm.c:220
 +msgid "export certificates"
 +msgstr "export certificates"
 +
 +#: sm/gpgsm.c:228
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
 +#: sm/gpgsm.c:231
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
 +#: sm/gpgsm.c:233
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
 +#: sm/gpgsm.c:250
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
 +#: sm/gpgsm.c:258
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
 +#: sm/gpgsm.c:260
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
 +#: sm/gpgsm.c:262
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
 +#: sm/gpgsm.c:269
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
 +#: sm/gpgsm.c:279
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
 +#: sm/gpgsm.c:284
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
 +#: sm/gpgsm.c:287
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
 +#: sm/gpgsm.c:290
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
 +#: sm/gpgsm.c:294
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
 +#: sm/gpgsm.c:305
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
 +#: 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:312
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
 +#: sm/gpgsm.c:315
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
 +#: sm/gpgsm.c:316
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
 +#: sm/gpgsm.c:317
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
 +#: 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:323
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
 +#: sm/gpgsm.c:350
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
 +#: sm/gpgsm.c:352
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
 +#: sm/gpgsm.c:559
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
 +#: 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: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:777
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
 +#: 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: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:868 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
 +#: sm/gpgsm.c:1427
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
 +#: sm/gpgsm.c:1630
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
 +#: 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: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
++#: sm/import.c:472 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
++#: sm/import.c:531 sm/import.c:563
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 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
++#: sm/qualified.c:215 sm/verify.c:624
 +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
++#: sm/sign.c:454
 +#, 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
++#: sm/sign.c:468
 +#, 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
++#: sm/sign.c:520
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
- #: sm/verify.c:450
++#: sm/verify.c:457
 +msgid "Signature made "
 +msgstr "Signature made "
 +
- #: sm/verify.c:454
++#: sm/verify.c:461
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
- #: sm/verify.c:455
++#: sm/verify.c:462
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
- #: sm/verify.c:474
++#: sm/verify.c:481
 +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
++#: sm/verify.c:602
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
- #: sm/verify.c:596
++#: sm/verify.c:603
 +msgid "                aka"
 +msgstr "                aka"
 +
- #: sm/verify.c:614
++#: sm/verify.c:621
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
 +#, 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
++#: dirmngr/certcache.c:142
 +#, 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
++#: dirmngr/certcache.c:153
 +#, 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
++#: dirmngr/certcache.c:293
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
 +msgid "  subject ="
 +msgstr "  subject ="
 +
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
++#, c-format
++msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
++msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
++
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
 +#, 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
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
 +#, 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
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
 +#, 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
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
 +#, 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
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
 +#, 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
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
 +#, 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
++#: dirmngr/crlcache.c:1860
 +#, 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
++#: dirmngr/crlcache.c:2003
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
 +#, 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
++#: dirmngr/crlcache.c:2058
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
 +#, 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
++#: dirmngr/crlcache.c:2114
 +#, 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
++#: dirmngr/crlcache.c:2130
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
 +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
++#: dirmngr/crlcache.c:2274
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
 +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
++#: dirmngr/crlcache.c:2300
 +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
++#: dirmngr/crlcache.c:2303
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
 +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
++#: dirmngr/crlcache.c:2328
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
 +#, 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
++#: dirmngr/crlfetch.c:183
 +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
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
 +#, 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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
 +#, 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
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
 +#, 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
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
 +#, 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:160
++#: dirmngr/dirmngr.c:162
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
 +msgid "allow online software version check"
 +msgstr "allow online software version check"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
 +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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
 +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:223
++#: dirmngr/dirmngr.c:225
 +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:225
++#: dirmngr/dirmngr.c:227
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
 +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:361
++#: dirmngr/dirmngr.c:381
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
 +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:443
++#: dirmngr/dirmngr.c:463
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
 +#, 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:1563
 +#, 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:1618 dirmngr/dirmngr.c:1702
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
 +#, 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:1776
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
 +#, 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:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
 +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
++#: dirmngr/misc.c:172
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
 +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
++#: dirmngr/ocsp.c:182
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
 +#, 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
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
 +#, 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
++#: dirmngr/ocsp.c:329
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
 +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
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
 +#, 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
++#: dirmngr/ocsp.c:677
 +#, 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
++#: dirmngr/ocsp.c:702
 +#, 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
++#: dirmngr/ocsp.c:703
 +msgid "good"
 +msgstr "good"
 +
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
 +#, 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
++#: dirmngr/ocsp.c:744
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
 +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
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
 +#, 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:2583
++#: dirmngr/server.c:2651
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
 +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
++#: dirmngr/validate.c:1169
 +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: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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
 +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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
 +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
++#: tools/gpgconf-comp.c:537
 +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
++#: tools/gpgconf-comp.c:561
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
 +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
++#: tools/gpgconf-comp.c:572
 +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
++#: tools/gpgconf-comp.c:576
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
 +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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
 +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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
 +msgid "OpenPGP"
 +msgstr "OpenPGP"
 +
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
 +msgid "Private Keys"
 +msgstr "Private Keys"
 +
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
 +msgid "Smartcards"
 +msgstr "Smartcards"
 +
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
 +msgid "S/MIME"
 +msgstr "S/MIME"
 +
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
 +msgid "Network"
 +msgstr "Network"
 +
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
 +msgid "Passphrase Entry"
 +msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
 +#, c-format
 +msgid "error closing '%s'\n"
 +msgstr "error closing ‘%s’\n"
 +
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
 +#, 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:74
 +msgid "check all programs"
 +msgstr "check all programs"
 +
 +#: tools/gpgconf.c:75
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
 +#: tools/gpgconf.c:76
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
 +#: tools/gpgconf.c:77
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
 +#: tools/gpgconf.c:79
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
 +#: 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:85
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
 +#: tools/gpgconf.c:87
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
 +#: tools/gpgconf.c:89
 +msgid "query the software version database"
 +msgstr "query the software version database"
 +
 +#: tools/gpgconf.c:90
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
 +#: tools/gpgconf.c:91
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
 +#: tools/gpgconf.c:92
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
 +#: tools/gpgconf.c:98
 +msgid "use as output file"
 +msgstr "use as output file"
 +
 +#: tools/gpgconf.c:102
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
 +#: tools/gpgconf.c:127
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
 +#: 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:553 tools/gpgconf.c:588
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
 +#: tools/gpgconf.c:562 tools/gpgconf.c:612 tools/gpgconf.c:645
 +msgid "Component not found"
 +msgstr "Component not found"
 +
 +#: tools/gpgconf.c:671
 +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 d214b74,c521758..de47fd8
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -17,7 -16,6 +17,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -28,41 -26,32 +28,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Ĉu vi vere volas krei subskriban kaj ĉifran ŝlosilon? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nevalida pasfrazo
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -80,75 -68,59 +80,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "malbona pasfrazo"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "pasfrazo estas tro longa\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "pasfrazo estas tro longa\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Nevalida signo en nomo\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "malbona MPI"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "malbona pasfrazo"
@@@ -158,151 -129,116 +158,158 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "neniu skribebla sekreta ŝlosilaro trovita: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "eraro dum kreado de pasfrazo: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "ŝanĝi la pasfrazon"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  #, fuzzy
  msgid "Admin PIN"
  msgstr "Donu la uzantidentigilon: "
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Ripetu pasfrazon: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Ripetu pasfrazon: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Ripetu pasfrazon: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -387,48 -309,33 +394,48 @@@ msgstr "
  "Opcioj:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Ŝlosilo estas anstataŭigita."
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -513,11 -403,6 +520,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -533,46 -416,33 +540,46 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, fuzzy, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ne povas krei %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Valida atestilrevoko"
@@@ -582,28 -451,22 +589,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
@@@ -630,7 -487,6 +637,7 @@@ msgstr "fido-datenaro: lego malsukcesi
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -655,12 -507,10 +662,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aktualigo de sekreto malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu ŝlosiloj ignoritaj\n"
@@@ -682,8 -528,6 +689,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -691,9 -535,6 +698,9 @@@ msgstr "
  "@Komandoj:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -747,8 -580,6 +754,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -807,8 -629,6 +814,8 @@@ msgstr "
  msgid "Yes"
  msgstr "jes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -859,19 -672,16 +866,19 @@@ msgstr "ŝanĝi la pasfrazon
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "ŝalti ŝlosilon"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -891,7 -698,6 +898,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@@ -918,22 -720,14 +925,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -948,8 -740,6 +955,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -959,12 -748,10 +966,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@@ -1194,8 -935,6 +1201,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1333,7 -1045,10 +1340,12 @@@ msgstr "eraro en vostolinio\n
  msgid "[none]"
  msgstr "nekonata versio"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "nevalida signo %02x en bazo 64 ignorita\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
@@@ -1409,7 -1110,6 +1421,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "ne traktita"
@@@ -1468,8 -1157,6 +1480,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1637,8 -1291,6 +1649,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1299,10 +1660,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Via elekto? "
  
@@@ -1723,17 -1355,11 +1735,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
@@@ -1800,7 -1413,6 +1812,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@@ -1831,13 -1438,10 +1843,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rondigita ĝis %u bitoj\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1892,9 -1486,6 +1904,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Nevalida elekto.\n"
  
@@@ -2029,23 -1591,15 +2041,23 @@@ msgstr "Nevalida komando (provu per \"h
  msgid "--output doesn't work for this command\n"
  msgstr "--output ne funkcias por ĉi tiu komando\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1648,6 +2118,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -2144,7 -1679,6 +2156,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2266,40 -1776,31 +2278,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ignorita: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skribas al '%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "ŝlosilo %08lX: PGP-2.x-stila ŝlosilo - ignorita\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTO: nenio estis eksportita\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2580,7 -2020,6 +2592,7 @@@ msgstr "|N|difini densig-nivelon N (0=n
  msgid "use canonical text mode"
  msgstr "uzi tekstan reĝimon"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
@@@ -2762,479 -2173,381 +2774,483 @@@ msgstr "Averto: malsekuraj permesoj su
  msgid "unknown configuration item '%s'\n"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, fuzzy, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, fuzzy, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  #, fuzzy
  msgid "invalid import options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, fuzzy, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "invalid export options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr ""
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVERTO: programo povas krei core-dosieron!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVERTO: %s nuligas %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ne eblas kun %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  #, fuzzy
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "elektita kompendi-metodo ne validas\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed devas esti pli granda ol 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed devas esti pli granda ol 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  #, 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:3737
++#: g10/gpg.c:3741
  #, 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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  #, fuzzy
  msgid "invalid default preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  #, fuzzy
  msgid "invalid personal cipher preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  #, fuzzy
  msgid "invalid personal digest preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  #, fuzzy
  msgid "invalid personal compress preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "malĉifrado malsukcesis: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, fuzzy, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "get_dir_record: search_record malsukcesis: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "elkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Ektajpu vian mesaĝon ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por atestado ne validas\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "Ĉu forviŝi ĉi tiun ŝlosilon de la ŝlosilaro? "
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  #, fuzzy
  msgid "make timestamp conflicts only a warning"
  msgstr "malkongruo de tempostampoj"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  #, fuzzy
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4592,15 -3640,10 +4608,15 @@@ msgid "
  "unless you restart the program.\n"
  msgstr ""
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "rev"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "eksval"
@@@ -4639,7 -3676,6 +4655,7 @@@ msgstr "Ĉu vi estas certa, ke vi ankor
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4671,7 -3701,6 +4687,7 @@@ msgstr[1] "Forviŝis %d subskribon.\n
  msgid "Nothing deleted.\n"
  msgstr "Nenio estis forviŝita.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "nevalida"
  
@@@ -4915,75 -3896,59 +4931,75 @@@ msgstr "Uzantidentigilo \"%s\" estas re
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "prefero %c%lu ripetita\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "nevalida signo en signoĉeno\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  #, fuzzy
  msgid "writing direct signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "skribas ŝlosilbindan subskribon\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "subskribi"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "ĉifri datenojn"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -4997,157 -3962,126 +5013,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur subskribi)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Subskribo-notacio: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Petita ŝlosilgrando estas %u bitoj\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5163,7 -4097,6 +5179,7 @@@ msgstr "
  "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
  "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5179,40 -4112,32 +5195,40 @@@ msgstr "
  "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
  "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Ŝlosilo validu ...? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Ŝlosilo validu por ...? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "nevalida valoro\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s eksvalidiĝos je %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5220,12 -4145,10 +5236,12 @@@ msgstr "
  "Via sistemo ne povas montri datojn post 2038.\n"
  "Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Ĉu tio estas ĝusta (j/n)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5236,7 -4159,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5252,50 -4174,39 +5268,50 @@@ msgstr "
  "    \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Vera nomo: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Nevalida signo en nomo\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Nomo ne povas komenciĝi per cifero\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nomo devas havi almenaŭ 5 signojn\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Retadreso: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Komento: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Nevalida signo en komento\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5306,7 -4217,6 +5322,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5321,35 -4231,28 +5337,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKkAaBbFf"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Bonvolu korekti la eraron unue\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5361,13 -4264,10 +5377,13 @@@ msgstr "
  "kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
  "akiri sufiĉe da entropio.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5375,66 -4275,53 +5391,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Kreado de ŝlosiloj nuligita.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5443,7 -4330,6 +5459,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5451,7 -4337,6 +5467,7 @@@ msgstr "
  "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
  "horloĝeraro)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5459,22 -4344,18 +5475,22 @@@ msgstr "
  "ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
  "horloĝeraro)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Ĉu vere krei? "
@@@ -5563,19 -4428,16 +5579,19 @@@ msgstr "     Ŝlosilo-fingrospuro =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "kontrolas ŝlosilaron '%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu ŝlosiloj kontrolitaj (%lu subskriboj)\n"
  msgstr[1] "%lu ŝlosiloj kontrolitaj (%lu subskriboj)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "\t%lu keys updated\n"
  msgid "%lu key cached"
@@@ -5583,7 -4445,6 +5599,7 @@@ msgid_plural "%lu keys cached
  msgstr[0] "\t%lu ŝlosiloj aktualigitaj\n"
  msgstr[1] "\t%lu ŝlosiloj aktualigitaj\n"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5591,7 -4452,6 +5607,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 malbona subskribo\n"
  msgstr[1] "1 malbona subskribo\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: ŝlosilaro kreita\n"
@@@ -5895,7 -4693,6 +5911,7 @@@ msgstr "ĉefa
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  #, fuzzy
  msgid "unknown"
  msgstr "nekonata versio"
@@@ -6108,55 -4863,44 +6124,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "subpaketo de speco %d havas ŝaltitan \"critical bit\"\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problemo kun agento: agento redonas 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Donu pasfrazon\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "nuligita de uzanto\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (ĉefŝlosilo %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6590,17 -5251,14 +6606,17 @@@ msgstr "malnova kodado de DEK ne estas 
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "ĉifrad-metodo %d%s estas nekonata aŭ malŝaltita\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  msgid "Note: key has been revoked"
  msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
@@@ -6889,17 -5498,14 +6905,17 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "subskribas:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s ĉifrado estos aplikata\n"
@@@ -6962,17 -5557,14 +6978,17 @@@ msgstr "%s: nevalida dosiero-versio %d\
  msgid "ownertrust value missing"
  msgstr "importi posedantofido-valorojn"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "eraro dum legado de dosieruja registro: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "kiraso: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "fido-datenaro: sync malsukcesis: %s\n"
@@@ -7006,7 -5592,6 +7022,7 @@@ msgstr "fido-datenaro-transakcio tro gr
  msgid "%s: directory does not exist!\n"
  msgstr "%s: dosierujo ne ekzistas!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "ne povas fermi '%s': %s\n"
@@@ -7148,10 -5705,6 +7164,10 @@@ msgstr "eraro dum kreado de pasfrazo: %
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7183,7 -5731,6 +7199,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7354,11 -5874,9 +7370,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7367,120 -5884,100 +7383,120 @@@
  msgid "resetting keydb: %s\n"
  msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Forviŝis %d subskribojn.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  msgid "Encrypted 0 messages."
  msgstr "Ripetu pasfrazon\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Gvidlinio: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7497,18 -5994,14 +7513,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7558,79 -6042,64 +7574,79 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sekva kontrolo de fido-datenaro je %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrolas la fido-datenaron\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  #, fuzzy
  msgid "no ultimately trusted keys found\n"
  msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7742,19 -6190,14 +7758,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7803,7 -6237,6 +7819,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -7818,69 -6249,67 +7834,84 @@@ msgstr "malsukcesis doni komencajn valo
  msgid "failed to store the creation date: %s\n"
  msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7889,27 -6318,22 +7920,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "ŝanĝi la pasfrazon"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "ŝanĝi la pasfrazon"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Kialo por revoko: "
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7917,117 -6341,93 +7948,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "eraro dum legado de ŝlosilbloko: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: eraro dum legado de libera registro: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "nerealigita URI"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@@ -8049,57 -6446,45 +8080,57 @@@ msgstr "Donu la uzantidentigilon: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "tute ne uzi la terminalon"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "malkongruaj komandoj\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8109,22 -6493,14 +8140,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "nevalida signo %02x en bazo 64 ignorita\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@@ -8143,12 -6516,10 +8169,12 @@@ msgstr "
  msgid "shell"
  msgstr "helpo"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8161,12 -6530,10 +8187,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "skribas sekretan ŝlosilon al '%s'\n"
@@@ -8194,9 -6556,6 +8220,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8219,12 -6574,10 +8245,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  #, fuzzy
  msgid "certificate not yet valid"
  msgstr "Valida atestilrevoko"
@@@ -8239,7 -6590,6 +8265,7 @@@ msgstr "Valida atestilrevoko
  msgid "intermediate certificate not yet valid"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "problemo ĉe legado de atestilo: %s\n"
@@@ -8295,7 -6634,6 +8321,7 @@@ msgstr "Valida atestilrevoko
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Fingrospuro:"
@@@ -8328,7 -6660,6 +8354,7 @@@ msgstr "Bona atestilo
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
@@@ -8340,31 -6670,25 +8366,31 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  #, fuzzy
  msgid "certificate chain too long\n"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  #, fuzzy
  msgid "issuer certificate not found"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "kontroli subskribon"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "Valida atestilrevoko"
@@@ -8395,11 -6714,9 +8421,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "ne"
@@@ -8435,36 -6747,28 +8461,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bita %s ŝlosilo, ID %08lX, kreita je %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8558,71 -6844,57 +8584,71 @@@ msgstr "eraro dum kreado de ŝlosilaro 
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (nur subskribi)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: eraro dum legado de libera registro: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "malŝalti ŝlosilon"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (subskribi kaj ĉifri)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
@@@ -8632,83 -6904,66 +8658,83 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Retadreso: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Donu la uzantidentigilon. Finu per malplena linio: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Donu novan dosiernomon"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr ""
  "\n"
  "Donu la uzantidentigilon. Finu per malplena linio: "
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  #, fuzzy
  msgid "Enter URIs"
  msgstr "Donu la uzantidentigilon: "
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  msgid "Now creating certificate request.  "
  msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8850,7 -7074,6 +8876,7 @@@ msgstr "aldoni ĉi tiun ŝlosilaron al 
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
@@@ -8938,17 -7145,14 +8964,17 @@@ msgstr "Bona atestilo
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -9012,7 -7205,6 +9038,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9026,166 -7217,136 +9052,171 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "protekto-metodo %d%s ne estas realigita\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Bona subskribo de \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "            alinome \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "ripetita atestilo - forviŝita"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "ripetita atestilo - forviŝita"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "ripetita atestilo - forviŝita"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Fingrospuro:"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "Nevalida atestilo"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "eraro dum kreado de pasfrazo: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "Valida atestilrevoko"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "Bona atestilo"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -9221,7 -7376,6 +9252,7 @@@ msgstr "forviŝo de ŝlosilbloko malsuk
  msgid "not removing file '%s'\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -9444,7 -7554,6 +9475,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9459,13 -7566,11 +9490,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9515,148 -7611,119 +9546,148 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "kontrolo de subskribo estas malŝaltita\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "lid ?: enŝovo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "skribas al '%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  msgid " WARNING: invalid cache record length\n"
  msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: eraro dum legado de libera registro: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? problemo en kontrolo de revoko: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "lid ?: enŝovo malsukcesis: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@@ -9665,50 -7731,38 +9696,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "eraro dum kreado de '%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@@ -9862,116 -7887,88 +9893,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Ĉu fini sen skribi ŝanĝojn? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9984,91 -7981,72 +10015,91 @@@ msgstr "
  "@\n"
  "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uzado: gpg [opcioj] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kiraso: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ne traktita"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10306,38 -8236,31 +10337,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "serĉas pri \"%s\" ĉe HKP-servilo %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "ne povas malfermi %s: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "aktualigo de sekreto malsukcesis: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10370,255 -8287,199 +10401,251 @@@ msgstr "eraro dum legado de '%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "Valida atestilrevoko"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "Bona atestilo"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: ne povas aliri: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "mankas implicita sekreta ŝlosilaro: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrolas la fido-datenaron\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "kontroli subskribon"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "Valida atestilrevoko"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10715,193 -8555,146 +10742,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|uzi pasfraz-reĝimon N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOMO|ĉifri por NOMO"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "reteraro"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "malbona pasfrazo"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "publika ŝlosilo ne trovita"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "eraro dum legado de '%s': %s\n"
diff --cc po/es.po
index 27ae74a,dd61f45..f4208d9
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -19,7 -18,6 +19,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "plural: Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@@ -30,47 -28,38 +30,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|entrada de pin-etiqueta|_Cancelar"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|entrada de pin-etiqueta|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|entrada de pin-etiqueta|_Cancelar"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "frase contraseña incorrecta
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Calidad:"
  
@@@ -88,18 -76,15 +88,18 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr "barra de calidad, entrada de pin"
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesión"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -107,7 -92,6 +107,7 @@@ msgstr "
  "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
  "de esta sesión"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
@@@ -120,45 -104,34 +120,45 @@@
  # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
  # ¿Es que son más listos? :-)
  #
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Frase contraseña:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "no coincide - reinténtelo"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (intento %d de %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN demasiado largo"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Frase contraseña demasiado larga"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Caracteres inválidos en el PIN"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN demasiado corto"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "PIN incorrecto"
  
@@@ -171,7 -144,6 +171,7 @@@
  # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
  # ¿Es que son más listos? :-)
  #
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Frase contraseña errónea"
  
@@@ -180,41 -151,24 +180,43 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, 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"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "detectada tarjeta con S/N: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
@@@ -222,37 -176,35 +224,43 @@@ msgstr "
  "error obteniendo ID de la clave por defecto para autenticaren la tarjeta: "
  "%s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "error obteniendo parámetros almacenados: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  #| msgid "Please enter the passphrase for the ssh key%0A  %c"
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Por favor introduzca la frase contraseña para la clave ssh%0A %c"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Por favor vuelva a introducir frase contraseña"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  #| msgid ""
  #| "Please enter a passphrase to protect the received secret key%%0A   %s"
@@@ -264,69 -216,54 +272,69 @@@ msgstr "
  "Por favor introduzca una frase contraseña para proteger la clave "
  "secretarecibida%%0A  %s%%0Aen el almacen de claves del agente gpg"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "fallo al crear un flujo desde el socket: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "PIN del Administrador"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Código de Reinicio"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, fuzzy, c-format
  #| msgid "%s%%0A%%0AUse the reader's keypad for input."
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AUse el teclado del lector como entrada."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Repita este Código de Reinicio"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Repita este PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Repita este PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "error creando fichero temporal: %s\n"
@@@ -433,47 -356,32 +441,47 @@@ msgstr "
  "@Opciones:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "ejecutar en modo servidor (primer plano)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "ejecutar en modo servidor"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "salida de datos estilo sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "salida de datos estilo csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "no independizarse de la consola"
  
@@@ -558,11 -449,6 +566,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
  
@@@ -584,48 -468,35 +592,48 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, 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:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "no se puede crear el socket: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
@@@ -635,29 -505,23 +643,29 @@@ msgstr "el nombre de socket `%s' es dem
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "error obteniendo valor único para el socket\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() falló: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
@@@ -689,7 -547,6 +697,7 @@@ msgstr "stat() falló para `%s': %s\n
  msgid "can't use '%s' as home directory\n"
  msgstr "no puede usar `%s' como directorio personal\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "error leyendo valor único en el descriptor %d: %s\n"
@@@ -714,14 -567,12 +722,14 @@@ msgstr "manejador ssh 0x%lx para el des
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s detenido\n"
@@@ -747,8 -594,6 +755,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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -756,9 -601,6 +764,9 @@@ msgstr "
  "@Órdenes:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -812,8 -646,6 +820,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -880,8 -703,6 +888,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Sí"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "No"
  
@@@ -936,7 -750,6 +944,7 @@@ msgstr "Cambia la frase contraseña
  msgid "I'll change it later"
  msgstr "La cambiaré más tarde"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -944,13 -757,11 +952,13 @@@
  "%%0A?"
  msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "habilita clave"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -971,7 -779,6 +979,7 @@@ msgstr "la clave %s usa un hash insegur
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "la comprobación de la firma creada falló: %s\n"
@@@ -998,23 -801,15 +1006,23 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "error creando tubería: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "error bifurcando procesos: %s\n"
@@@ -1030,8 -823,6 +1038,8 @@@ msgstr "fallo esperando que el proceso 
  msgid "error running '%s': probably not installed\n"
  msgstr "error ejecutando `%s': probablemente no está instalado\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
@@@ -1043,13 -833,11 +1051,13 @@@ msgstr "error ejecutando `%s': código 
  msgid "error running '%s': terminated\n"
  msgstr "error ejecutando `%s': terminado\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "fallo esperando que el proceso %d terminara: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "error obteniendo código de finalización del proceso: %d %s\n"
@@@ -1274,8 -1016,6 +1282,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmo no disponible: %s"
@@@ -1396,7 -1109,10 +1404,12 @@@ msgstr "ignorando línea con basura
  msgid "[none]"
  msgstr "[ninguno]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "caracter inválido radix64 %02x omitido\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "parámetro inesperado"
  
@@@ -1465,7 -1167,6 +1478,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "memoria desbordada\n"
  
@@@ -1528,8 -1218,6 +1541,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@@ -1695,8 -1350,6 +1708,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1356,9 +1717,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Su elección: "
  
@@@ -1773,17 -1406,11 +1786,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "error leyendo `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
@@@ -1845,7 -1459,6 +1858,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "error obteniendo la información actual de la clave: %s\n"
@@@ -1884,13 -1492,10 +1897,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeados a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
@@@ -1951,9 -1546,6 +1964,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Elección inválida.\n"
  
@@@ -2081,23 -1644,15 +2094,23 @@@ msgstr "Orden inválida (pruebe \"help\
  msgid "--output doesn't work for this command\n"
  msgstr "--output no funciona con esta orden\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1701,6 +2171,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "error creando frase contraseña: %s\n"
@@@ -2198,7 -1734,6 +2211,7 @@@ msgstr "
  "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
  "del destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2327,39 -1838,30 +2340,39 @@@ msgstr "borrar tanto como sea posible d
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "escribiendo en `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "clave %s: material de la clave en la tarjeta - omitida\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "no se permite exportar claves secretas\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "ATENCIÓN: no se ha exportado nada\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2634,7 -2075,6 +2647,7 @@@ msgstr "|N|nivel de compresión N (0 de
  msgid "use canonical text mode"
  msgstr "usa modo de texto canónico"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FICHERO|volcar salida en FICHERO"
  
@@@ -2842,472 -2254,374 +2855,476 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "artículo de configuración desconocido `%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "mostrar foto IDs al listar claves"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "mostrar URLS de política al listar firmas"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "mostrar todas las notaciones al listar firmas"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "mostrar notaciones estándar IETF al listar firmas"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "mostrar notaciones personalizadas al listar firmas"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "mostrar URL del servidor de claves preferido al listar firmas"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "mostrar validez de la ID de usuario al listar claves"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "mostrar subclaves revocadas y expiradas al listar claves"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "mostrar nombre de los anillos de claves al listar claves"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "mostrar fechas de caducidad al listar firmas"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "opción desconocida `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opciones de importación inválidas\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opciones de importación inválidas\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: lista de opciones inválida\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "mostrar foto IDs al verificar firmas"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "mostrar URLs de política al verificar firmas"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "mostrar todas las notaciones al verificar firmas"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "mostrar notaciones estándar IETF al verificar firmas"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "mostrar notaciones personalizadas al verificar firmas"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "mostrar validez del ID de usuario al verificar firmas"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "mostrar solo ID primario de usuario al verificar firmas"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "validar firmas con datos PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "aumentar confianza en las firmas con datos válidos PKA"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "imposible establecer camino de ejecutables %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, 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:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "lista de auto-localización de claves inválida\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s sustituye a %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "¡%s no permitido con %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "¡%s no tiene sentido con %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "AVISO: ejecutándose con hora del sistema falsificada"
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "el algoritmo de cifrado seleccionado es inválido\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "el algoritmo de compresión seleccionado es inválido\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser mayor que 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser mayor que 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferencias por defecto inválidas\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferencias personales de cifrado inválidas\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferencias personales de algoritmo de resumen inválidas\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferencias personales de compresión inválidas\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s aún no funciona con %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, 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:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "recepción del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "exportación de clave fallida: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "búsqueda del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "renovación al servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "eliminación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "creación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
  # Falta un espacio.
  # 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:4904
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Adelante, teclee su mensaje...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL de política de certificado inválida\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL de política inválida\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la URL del servidor de claves preferido no es válida\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FICHERO|tomar las claves del anillo FILE"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  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:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|DF|escribe información de estado en este descriptor de fichero"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4635,14 -3684,9 +4652,14 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "revocada"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "caducada"
  
@@@ -4681,7 -3719,6 +4698,7 @@@ msgstr "¿Está seguro de querer añadi
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
  
@@@ -4713,7 -3744,6 +4730,7 @@@ msgstr[1] "%d firmas borradas.\n
  msgid "Nothing deleted.\n"
  msgstr "No se borró nada\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "inválida"
  
@@@ -4950,73 -3932,57 +4967,73 @@@ msgstr "La subclave %s ya ha sido revoc
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia `%s' duplicada\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias de cifrado\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias de resumen\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferencias de compresión\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "escribiendo firma directa\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "escribiendo autofirma\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "escribiendo la firma de comprobación de clave\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamaño de clave redondeado a %u bits\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Firma"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certificar"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Cifrado"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Autentificación"
  
@@@ -5030,158 -3996,127 +5047,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "FfCcAaSs"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Posibles accriones para una %s clave: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Acciones permitidas actualmente: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Conmutar la capacidad de firmar\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Conmutar la capacidad de cifrado\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Conmutar la capacidad de autenticación\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Acabado\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor seleccione tipo de clave deseado:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA y RSA (por defecto)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (sólo firmar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (sólo firmar)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (sólo cifrar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (sólo cifrar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Clave existente\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Introduzca keygrip: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  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:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "No hay claves con ese keygrip\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "¿De qué tamaño quiere la subclave? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "¿De qué tamaño quiere la clave? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "El tamaño requerido es de %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5197,7 -4132,6 +5214,7 @@@ msgstr "
  "      <n>m = la clave caduca en n meses\n"
  "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5213,38 -4147,30 +5230,38 @@@ msgstr "
  "      <n>m = la clave caduca en n meses\n"
  "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "¿Validez de la clave (0)? "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Clave válida ¿durante? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valor inválido\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "La clave nunca caduca\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "La firma nunca caduca\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clave caduca %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La firma caduca el %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5252,11 -4178,9 +5269,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "¿Es correcto? (s/n) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5270,7 -4194,6 +5287,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5286,50 -4209,39 +5303,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nombre y apellidos: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Caracter inválido en el nombre\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "El nombre no puede empezar con un número\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "El nombre debe tener al menos 5 caracteres\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Dirección de correo electrónico: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Dirección inválida\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Caracter inválido en el comentario\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5340,7 -4252,6 +5357,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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 "
@@@ -5357,31 -4268,24 +5374,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcDdVvSs"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primero el error.\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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 -4298,10 +5411,13 @@@ msgstr "
  "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
  "entropía.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Creación de la clave fallida: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5408,71 -4309,58 +5425,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, 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:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Creación de claves cancelada.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "anillo público de claves no escribible encontrado: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "claves pública y secreta creadas y firmadas.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5480,7 -4368,6 +5497,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5488,7 -4375,6 +5505,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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5496,21 -4382,17 +5513,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "¿Crear de verdad? (s/N) "
  
@@@ -5591,13 -4457,11 +5608,13 @@@ msgstr "      Huella de clave =
  msgid "      Card serial no. ="
  msgstr "      Número de serie de la tarjeta ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "memorizando anillo `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5605,7 -4469,6 +5622,7 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
  msgstr[1] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "\t%lu keys updated\n"
  msgid "%lu key cached"
@@@ -5613,7 -4476,6 +5630,7 @@@ msgid_plural "%lu keys cached
  msgstr[0] "\t%lu claves actualizadas\n"
  msgstr[1] "\t%lu claves actualizadas\n"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5621,7 -4483,6 +5638,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 firma incorrecta\n"
  msgstr[1] "1 firma incorrecta\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: anillo creado\n"
@@@ -5920,7 -4719,6 +5937,7 @@@ msgstr "binaria
  msgid "textmode"
  msgstr "modotexto"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "desconocido"
  
@@@ -6142,61 -4898,50 +6159,61 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema con el agente: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Introduzca frase contraseña\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "cancelado por el usuario\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr "(ID de clave primaria %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Introduzca frase contraseña para desproteger el objeto PKCS#12."
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6633,18 -5295,15 +6650,18 @@@ msgstr "la antigua codificación de la 
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: clave secreta %s caducó el %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6949,7 -5559,6 +6966,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s firma de: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6957,11 -5566,9 +6974,11 @@@ msgstr "
  "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
  "preferencias del destinatario\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "firmando:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "se usará un cifrado %s\n"
@@@ -7020,19 -5616,16 +7037,19 @@@ msgstr "huella dactilar no válida
  msgid "ownertrust value missing"
  msgstr "falta el valor de confianza"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "error econtrando registro de confianza en `%s': %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de datos de confianza: fallo sincronización: %s\n"
@@@ -7069,7 -5656,6 +7086,7 @@@ msgstr "transacción en la base de dato
  msgid "%s: directory does not exist!\n"
  msgstr "%s: ¡el directorio no existe!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7213,10 -5771,6 +7230,10 @@@ msgstr "error creando fichero temporal
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7251,7 -5800,6 +7268,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error abriendo `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7427,11 -5948,9 +7444,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7441,61 -5959,52 +7458,61 @@@
  msgid "resetting keydb: %s\n"
  msgstr "error escribiendo clave: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "error almacenando parámetros: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "error creando tubería: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, fuzzy, c-format
  #| msgid "second"
  msgid "%lld~second"
@@@ -7503,18 -6012,15 +7520,18 @@@ msgid_plural "%lld~seconds
  msgstr[0] "segundo"
  msgstr[1] "segundo"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d firmas borradas\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7522,43 -6028,35 +7539,43 @@@ msgid_plural "%s: Verified %ld~signatur
  msgstr[0] "imprime resúmenes de mensaje"
  msgstr[1] "imprime resúmenes de mensaje"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  msgid "Encrypted 0 messages."
  msgstr "el algoritmo de resumen seleccionado no es válido\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Política: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7575,19 -6073,15 +7592,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7638,26 -6123,21 +7655,26 @@@ msgstr "
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "usando %s como modelo de confianza\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  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:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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"
@@@ -7665,7 -6145,6 +7682,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:549
++#: g10/trustdb.c:564
  #, 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"
@@@ -7673,20 -6152,16 +7690,20 @@@ msgstr "
  "no es necesario comprobar la base de datos de confianza\n"
  "con el modelo `%s'\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "clave pública %s no encontrada: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "por favor haga un --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "comprobando base de datos de confianza\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7694,7 -6169,6 +7711,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7702,16 -6176,13 +7719,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "no se encuentran claves absolutamente fiables\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7719,7 -6190,6 +7736,7 @@@ msgstr "
  "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7838,19 -6287,14 +7855,19 @@@ msgstr "
  "Sintaxis: kbxutil [opciones] [ficheros]\n"
  "listar, exportar, importar datos Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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"
@@@ -7900,7 -6335,6 +7917,7 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
@@@ -7915,68 -6347,68 +7932,85 @@@ msgstr "fallo al almacenar la huella di
  msgid "failed to store the creation date: %s\n"
  msgstr "fallo guardando la fecha de creación: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "error recuperando el estatus CHV de la tarjeta\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "la respuesta no incluye el módulo RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  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:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "la respuesta no incluye la clave pública\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "fallo leyendo clave pública: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "usando PIN por defecto %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "la verificación CHV%d falló: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "error recuperando el estatus CHV de la tarjeta\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "¡la tarjeta está bloqueada permanentemente!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7990,25 -6422,19 +8024,24 @@@ msgstr[1] "
  "bloquearpermanentemente la clave\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Por favor introduzca PIN de Administrador"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "el acceso a órdenes de administrador no está configurado\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Por favor introduzca PIN"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -8016,83 -6442,65 +8049,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|CR|Nuevo Código de Reinicio"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nuevo PIN Administrador"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Nuevo PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, 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:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "error leyendo datos de la aplicación\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "error leyendo huella digital DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "la clave ya existe\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "la clave existente será reemplazada\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "generando nueva clave\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "escribiendo clave nueva\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "falta fecha de creación\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "fallo al almacenar la clave: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI no disponible"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "por favor, espere mientras se genera la clave ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "la generación de la clave falló\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8100,31 -6508,25 +8133,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "firmas creadas hasta ahora: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@@ -8146,55 -6545,43 +8179,55 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FICHERO|escribir log en FICHERO"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|conectar el lector al puerto N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOMBRE|usa NOMBRE como driver ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOMBRE|usa NOMBRE como driver PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "no usa el driverd del CCID interno"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  #, fuzzy
  #| msgid "do not use a reader's keypad"
  msgid "do not use a reader's pinpad"
  msgstr "no usa el teclado del lector"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "denegar órdenes de administración de la tarjeta"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, 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:288
++#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8213,22 -6599,14 +8246,17 @@@ msgstr "
  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:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "manejador del descriptor %d iniciado\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "manejador del descriptor %d terminado\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter inválido radix64 %02x omitido\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8247,12 -6622,10 +8275,12 @@@ msgstr "cadena
  msgid "shell"
  msgstr "shell"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "la extensión crítica de certificado %s no puede usarse"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "el certificado del emisor no está marcado como CA"
  
@@@ -8266,13 -6637,11 +8294,13 @@@ msgstr "política marcada como crític
  msgid "failed to open '%s': %s\n"
  msgstr "fallo abriendo `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "nota: no se permiten políticas no críticas de certificados"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "no se permite política de certificado"
  
@@@ -8299,9 -6663,6 +8327,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8322,12 -6679,10 +8350,12 @@@ msgstr "por favor asegúrese de que \"d
  msgid "checking the CRL failed: %s"
  msgstr "la comprobación de CRL falló: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "validez del certificado incorrecta: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "el certificado aún no es válido"
  
@@@ -8339,7 -6692,6 +8367,7 @@@ msgstr "el certificado raíz no es vál
  msgid "intermediate certificate not yet valid"
  msgstr "el certificado intermedio aún no es válido"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "certificado caducado"
  
@@@ -8389,7 -6730,6 +8417,7 @@@ msgstr "  (certificado válido desde 
  msgid "  (     issuer valid from "
  msgstr "  (     emisor válido desde "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "huella dactilar=%s\n"
@@@ -8418,7 -6752,6 +8446,7 @@@ msgstr "no se encuentra el emisor de es
  msgid "self-signed certificate has a BAD signature"
  msgstr "certificado auto firmado con firma INCORRECTA"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "el certificado raíz no está marcado como fiable"
  
@@@ -8427,28 -6759,22 +8455,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "la comprobación de la lista de confianza falló: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "cadena de certificados demasiado larga\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "no se encuentra emisor del certificado"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "el certificado tiene una firma INCORRECTA"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "cadena de certificados más larga de lo que permite la CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "certificado correcto\n"
  
@@@ -8474,11 -6795,9 +8502,11 @@@ msgstr "modelo de validación usado: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(es el algoritmo MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "ninguno"
  
@@@ -8513,44 -6827,36 +8541,44 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "error obteniendo información sobre uso de la clave: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  #, fuzzy
  #| msgid "certificate should have not been used for certification\n"
  msgid "certificate should not have been used for certification\n"
  msgstr "el certificado no debería haberse usado para certificar\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  #, fuzzy
  #| msgid "certificate should have not been used for encryption\n"
  msgid "certificate should not have been used for encryption\n"
  msgstr "el certificado no debería haberse usado para cifrar\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for signing\n"
  msgstr "el certificado no debería haberse usado para firmar\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "el certificado no es utilizable para cifrar\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "el certificado no es utilizable para firmar\n"
  
@@@ -8657,7 -6945,6 +8685,7 @@@ msgstr "línea %d: error obteniendo cla
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "línea %d: generación de clave fallida: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8665,64 -6952,51 +8693,64 @@@ msgstr "
  "Para completar este certificado introduzca por favor la frase contraseñapara "
  "la clave que acaba de crear una vez más.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Clave existente\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Clave existente de la tarjeta\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "error leyendo la tarjeta: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Número de serie de la tarjeta: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Claves disponibles:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Posibles acciones para una clave %s:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) firmar, cifrar\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) firmar\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) cifrar\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Introduzca nombre de entidad para X.509"
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "No se dió nombre de entidad\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8733,79 -7007,62 +8761,79 @@@ msgstr "Etiqueta de nombre de entidad i
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
  msgstr "Nombre de entidad inválido `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "28 visto por el traductor hasta la comilla inclusive"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Dirección de correo electrónico: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (termine con una línea en blanco):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Introduzca nombres de DNS"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (opcional; acabe con una línea en blanco):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Introduzca URIs"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
  msgstr "certificado auto firmado con firma INCORRECTA"
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
  msgstr "Creando una petición de certificado.  Puede llevar un rato ...\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "Acabado. Debería mandar esta petición a su CA.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "problema de recursos: memoria desbordada\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(el algoritmo RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(no parece un mensaje cifrado)\n"
  
@@@ -8947,7 -7173,6 +8975,7 @@@ msgstr "|FICHERO|añade este anillo a l
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ESPEC|usa este servidor para buscar claves"
  
@@@ -9040,17 -7249,14 +9068,17 @@@ msgstr "error almacenando certificado\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "fallaron comprobaciones básicas sobre el certificado - no importado\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "error obteniendo parámetros almacenados: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "error importando el certificado: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "error leyendo entrada: %s\n"
@@@ -9120,7 -7315,6 +9148,7 @@@ msgstr "
  "\n"
  "%s%sEstá realmente seguro de querer hacer esto?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9139,179 -7332,150 +9167,185 @@@ msgstr "
  "\"%s\"\n"
  "¡Observe que este certificado NO creará una firma cualificada!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "la comprobación de la firma cualificada falló: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Firmado el "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[no hay fecha]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "usando el certificado ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr "firma inválida: el resumen del mensaje no coincide con el calculado\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Firma correcta de"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                alias"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Es una firma cualificada\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  #| msgid "can't write keyblock: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "no puede escribirse el bloque de claves: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "problema buscando el certificado existente: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
  msgstr "buscando emisor en el caché de Dirmngr\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "no se puede crear %s: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
  msgstr "certificado `%s' borrado\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
  msgstr "certificado duplicado `%s' borrado\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
  msgstr "certificado `%s' borrado\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "huella dactilar=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
  msgstr "Certificados incluidos"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
  msgstr "número de certificados coincidentes: %d\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "number of matching certificates: %d\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "número de certificados coincidentes: %d\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
  msgstr "  (certificado creado en "
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate cached\n"
  msgstr "certificado correcto\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "huella dactilar no válida"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
  msgstr "no se encuentra el emisor de este certificado"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9353,7 -7511,6 +9387,7 @@@ msgstr "fallo recibiendo la línea: %s\
  msgid "not removing file '%s'\n"
  msgstr "creación de armadura fallida: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9598,7 -7711,6 +9632,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "error obteniendo parámetros almacenados: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9615,13 -7725,11 +9649,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "respuesta del agente inválida\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9676,165 -7775,136 +9710,165 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "suprimida la verificación de la firma\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "error leyendo la lista de certificados raíz fiables\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "lectura fallida: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "no se puede crear el fichero temporal `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "no se puede crear el fichero temporal `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "error creando fichero temporal: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "lid ?: inserción fallida: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "error escribiendo en el fichero temporal: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "error creando fichero temporal: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
  msgstr "error leyendo entrada: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
  msgstr "error creando tubería: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "renombrando `%s' en `%s' fallo: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
  "ATENCIÓN: tamaño incorrecto del fichero de semillas aleatorias - no se usa\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
  msgstr "error leyendo la tarjeta: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "problema re-buscando el certificado: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
  msgstr "error leyendo valor único en el descriptor %d: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "lectura fallida: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "lid ?: inserción fallida: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9844,54 -7913,42 +9878,54 @@@ msgstr "fallo recibiendo la línea: %s\
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: error escribiendo registro de directorio: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "demasiadas preferencias de cifrado\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
  msgstr "error recuperando `%s' vía %s: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
  msgstr "error ejecutando `%s': código de finalización %d\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "certificado `%s' no encontrado: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate search not possible due to disabled %s\n"
@@@ -10058,122 -8086,95 +10092,122 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, 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:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "pasar una orden a dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "¿Salir sin grabar? (s/N) "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "permitir búsquedas PKA (peticiones DNS)"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHERO|lee opciones desde FICHERO"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  #, 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:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
@@@ -10181,7 -8182,6 +10215,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:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10194,13 -8194,11 +10228,13 @@@ msgstr "
  "@\n"
  "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, 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:363
++#: dirmngr/dirmngr.c:383
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10212,88 -8210,71 +10246,88 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, 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:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "uso: gpgsm [opciones] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forzado"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10551,40 -8484,33 +10585,40 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "enviando clave %s a %s servidor %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versión del fichero %d inválida\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
  msgstr "iconv_open falló: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "actualización de la clave secreta fallida: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10623,288 -8543,232 +10657,284 @@@ msgstr "error almacenando parámetros: 
  msgid "error building OCSP request: %s\n"
  msgstr "error cargando `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
  msgstr "error escribiendo en `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "error leyendo de %s: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
  msgstr "error ejecutando `%s': código de finalización %d\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "error enlazando el socket con `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
  msgstr "fallo recibiendo la línea: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
  msgstr "no se encuentra emisor del certificado"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
  msgstr "error leyendo la lista de certificados raíz fiables\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
  msgstr "error almacenando certificado\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "fallo al reservar handle de keyDB\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: no se puede abrir: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "no hay anillo secreto de claves por defecto: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
  msgstr "usando PIN por defecto %s\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "usando cifrado %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "el certificado ha sido revocado"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "fallo mandando la línea: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "fallo mandando la línea: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, 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:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "firma fallida: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
  msgstr "el certificado del emisor no está marcado como CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "comprobando base de datos de confianza\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
  msgstr "la comprobación de CRL falló: %s"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
  msgstr "certificado auto firmado con firma INCORRECTA"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "la comprobación de la firma cualificada falló: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
  msgstr "certificado correcto\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
@@@ -11012,162 -8855,121 +11042,162 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  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:723
- #: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Opciones que controlan la seguridad"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|las claves SSH caducan en N segundos"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Opciones que fuerzan una política de frases contraseña"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "no permitir evitar la política de frases contraseña"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FICHERO|comprobar nuevas frases contraseña con el patrón en FICHERO"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|frase contraseña caduca tras N días"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "no permite reusar antiguas frases contraseña"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOMBRE|cifra para el ususario NOMBRE también"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|ESPEC|establecer alias de email"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Configuración para servidores de claves"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|usar servidor de claves en URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "permitir búsquedas PKA (peticiones DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "prohibir todo acceso al dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "no comprobar CRLs para certificados raíz"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Opciones que controlan el formato de la salida"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Opciones que controlan la interactividad y obligación"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Opciones que controlan la seguridad"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Configuración de servidores HTTP"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "usar configuración del proxy HTTP del sistema"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Configuración de servidores LDAP que se usará"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "lista de servidores LDAP"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Configuración de OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
@@@ -11182,34 -8984,28 +11212,34 @@@ 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:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Frase contraseña errónea"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Componente no encontrado"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Verificación externa del componente %s fallida"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Note que las especificación de grupo se ignoran\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing '%s'\n"
  msgstr "error cerrando %s: %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/et.po
index 9315f93,1b3b417..c4c25fb
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -15,7 -14,6 +15,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8-bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@@ -26,40 -24,31 +26,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "vigane parool
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -77,75 -65,59 +77,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "halb parool"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "rida on liiga pikk\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "liiga pikk parool\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Lubamatu sümbol nimes\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "halb MPI"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "halb parool"
@@@ -155,150 -126,115 +155,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "`%s' ei õnnestu avada: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "viga parooli loomisel: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muuda parooli"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Korrake parooli: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Korrake parooli: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Korrake parooli: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "parooli ei korratud õieti; proovige uuesti"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "parooli ei korratud õieti; proovige uuesti"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "parooli ei korratud õieti; proovige uuesti"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -383,48 -305,33 +390,48 @@@ msgstr "
  "Võtmed:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Võti on asendatud"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,11 -399,6 +516,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -529,47 -412,34 +536,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -579,28 -448,22 +586,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
@@@ -628,7 -485,6 +635,7 @@@ msgstr "trustdb: lugemine ebaõnnestus 
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: kataloogi ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -653,12 -505,10 +660,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: jätsin vahele: %s\n"
@@@ -680,8 -526,6 +687,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -533,6 +696,9 @@@ msgstr "
  "@Käsud:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -578,6 +752,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -805,8 -627,6 +812,8 @@@ msgstr "
  msgid "Yes"
  msgstr "jah"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -857,19 -670,16 +864,19 @@@ msgstr "muuda parooli
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "luba võti"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -889,7 -696,6 +896,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
@@@ -916,22 -718,14 +923,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -946,8 -738,6 +953,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -957,12 -746,10 +964,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1189,8 -930,6 +1196,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1326,7 -1038,10 +1333,12 @@@ msgstr "viga lõpetaval real\n
  msgid "[none]"
  msgstr "tundmatu"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "kirjutan salajase võtme faili `%s'\n"
@@@ -1402,7 -1103,6 +1414,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "ei töödeldud"
@@@ -1461,8 -1150,6 +1473,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1630,8 -1284,6 +1642,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1292,10 +1653,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Teie valik? "
  
@@@ -1716,17 -1348,11 +1728,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1793,7 -1406,6 +1805,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1824,13 -1431,10 +1836,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "ümardatud üles %u bitini\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1885,9 -1479,6 +1897,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Vigane valik.\n"
  
@@@ -2022,23 -1584,15 +2034,23 @@@ msgstr "Vigane käsklus (proovige \"hel
  msgid "--output doesn't work for this command\n"
  msgstr "võti --output ei tööta selle käsuga\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1642,6 +2112,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -2139,7 -1674,6 +2151,7 @@@ msgid "
  msgstr ""
  "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2271,40 -1781,31 +2283,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: jätsin vahele: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "kirjutan faili `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "HOIATUS: midagi ei eksporditud\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2587,7 -2027,6 +2599,7 @@@ msgstr "|N|määra pakkimise tase N (0 
  msgid "use canonical text mode"
  msgstr "kasuta kanoonilist tekstimoodi"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
@@@ -2768,471 -2179,373 +2780,475 @@@ msgstr "Hoiatus: ebaturvalised kataloog
  msgid "unknown configuration item '%s'\n"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "HOIATUS: %s määrab üle %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s ei ole koos lubatud!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ja %s ei oma koos mõtet!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed peab olema suurem, kui 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed peab olema suurem, kui 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "vigased vaikimisi eelistused\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "vigased isikliku šifri eelistused\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "vigased isikliku lühendi eelistused\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "vigased isikliku pakkimise eelistused\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ei tööta veel koos %s-ga\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "võtme eksport ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "lahtipakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Kirjutage nüüd oma teade ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "antud sertifikaadi poliisi URL on vigane\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "võta võtmed sellest võtmehoidlast"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "teata ajatemplite konfliktist ainult hoiatusega"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4580,15 -3628,10 +4596,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[tühistatud] "
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4628,7 -3665,6 +4644,7 @@@ msgstr "Olete kindel, et soovite seda i
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4660,7 -3690,6 +4676,7 @@@ msgstr[1] "Kustutatud %d allkiri.\n
  msgid "Nothing deleted.\n"
  msgstr "Midagi ei kustutatud.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "vigane pakend"
@@@ -4901,74 -3882,58 +4917,74 @@@ msgstr "kasutaja ID \"%s\" on juba tüh
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "lubamatu sümbol eelistuste sõnes\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "kirjutan otsese allkirja\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "kirjutan iseenda allkirja\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "kirjutan võtit siduva allkirja\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "vigane võtme suurus; kasutan %u bitti\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "võtme suurus ümardatud üles %u bitini\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "krüpteeri andmed"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -4982,157 -3947,126 +4998,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allkirja noteerimine: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Soovitud võtmepikkus on %u bitti\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5148,7 -4082,6 +5164,7 @@@ msgstr "
  "      <n>m = võti aegub n kuuga\n"
  "      <n>y = võti aegub n aastaga\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5164,40 -4097,32 +5180,40 @@@ msgstr "
  "      <n>m = allkiri aegub n kuuga\n"
  "      <n>y = allkiri aegub n aastaga\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Võti on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allkiri on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "vigane väärtus\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s aegub %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allkiri aegub %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5205,12 -4130,10 +5221,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "On see õige (j/e)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5221,7 -4144,6 +5237,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5237,50 -4159,39 +5253,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Pärisnimi: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Lubamatu sümbol nimes\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Nimi ei või alata numbriga\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-posti aadress: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Kommentaar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Lubamatu sümbol kommentaaris\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5291,7 -4202,6 +5307,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5306,35 -4216,28 +5322,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoVv"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Palun parandage kõigepealt viga\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5346,13 -4249,10 +5362,13 @@@ msgstr "
  "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
  "koguda paremat entroopiat.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5360,66 -4260,53 +5376,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Kasutan seda võtit ikka? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "genereeri uus võtmepaar"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Võtme genereerimine katkestati.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5429,34 -4316,28 +5445,34 @@@ msgstr "
  "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
  "kasutades võtit \"--edit-key\".\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, 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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Loon tõesti? "
@@@ -5539,26 -4404,22 +5555,26 @@@ msgstr "     Võtme sõrmejälg =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "kontrollin võtmehoidlat `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "kontrollitud %lu võtit (%lu allkirja)\n"
  msgstr[1] "kontrollitud %lu võtit (%lu allkirja)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5566,7 -4427,6 +5582,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 halb allkiri\n"
  msgstr[1] "1 halb allkiri\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: võtmehoidla on loodud\n"
@@@ -5867,7 -4665,6 +5883,7 @@@ msgstr "binaarne
  msgid "textmode"
  msgstr "tekstimood"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "tundmatu"
  
@@@ -6085,55 -4840,44 +6101,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "probleem agendiga: agent tagastas 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Sisestage parool\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "katkestatud kasutaja poolt\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (peamise võtme ID %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6562,17 -5223,14 +6578,17 @@@ msgstr "vana DEK kodeerimine ei ole toe
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "šifri algoritm %d%s on tundmatu või blokeeritud\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "MÄRKUS: šifri algoritm %d puudub eelistustes\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6863,18 -5472,15 +6879,18 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s allkiri kasutajalt: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "allkirjastan:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "kasutatakse %s krüpteerimist\n"
@@@ -6938,17 -5533,14 +6954,17 @@@ msgstr "viga: vigane sõrmejälg\n
  msgid "ownertrust value missing"
  msgstr "impordi usalduse väärtused"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "viga usalduse kirje otsimisel: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync ebaõnnestus: %s\n"
@@@ -6982,7 -5568,6 +6998,7 @@@ msgstr "trustdb transaktsioon on liiga 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: kataloogi ei ole!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "`%s' ei õnnestu sulgeda: %s\n"
@@@ -7125,10 -5682,6 +7141,10 @@@ msgstr "viga parooli loomisel: %s\n
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7160,7 -5708,6 +7176,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7332,11 -5852,9 +7348,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7345,121 -5862,101 +7361,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Kustutatud %d allkirja.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "krüpteeritud kasutades %lu parooli\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Poliis: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7476,18 -5973,14 +7492,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7537,56 -6021,45 +7553,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "trustdb järgmine kontroll %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "ei leia avalikku võtit %08lX: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "palun tehke --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrollin trustdb faili\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7594,22 -6067,18 +7610,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "absoluutselt usaldatavaid võtmeid pole\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7723,19 -6171,14 +7739,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7784,7 -6218,6 +7800,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -7799,69 -6230,67 +7815,84 @@@ msgstr "TrustDB initsialiseerimine eba�
  msgid "failed to store the creation date: %s\n"
  msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7870,27 -6299,22 +7901,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "muuda parooli"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "muuda parooli"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Palun valige tühistamise põhjus:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7898,117 -6322,93 +7929,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "viga võtmebloki lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "mittetoetatud URI"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "ei leia OpenPGP andmeid.\n"
@@@ -8029,57 -6426,45 +8060,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NIMI|kasuta NIME vaikimisi saajana"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NIMI|kasuta NIME vaikimisi saajana"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "ära kasuta terminali"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "vastuolulised käsud\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8089,22 -6473,14 +8120,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -8123,12 -6496,10 +8149,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8141,12 -6510,10 +8167,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "`%s' ei õnnestu avada: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "kirjutan salajase võtme faili `%s'\n"
@@@ -8174,9 -6536,6 +8200,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8199,12 -6554,10 +8225,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8217,7 -6568,6 +8243,7 @@@ msgstr "kirjutan salajase võtme faili 
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "See võti on aegunud!"
@@@ -8273,7 -6612,6 +8299,7 @@@ msgstr "halb sertifikaat
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "näita sõrmejälge"
@@@ -8303,7 -6635,6 +8329,7 @@@ msgstr "genereeri tühistamise sertifik
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8312,29 -6642,23 +8338,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "kontrolli allkirja"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "eelistus %c%lu on duplikaat\n"
@@@ -8363,11 -6682,9 +8389,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "ei"
@@@ -8403,36 -6715,28 +8429,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8526,72 -6812,58 +8552,72 @@@ msgstr "viga võtmehoidla `%s' loomisel
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "blokeeri võti"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Kirjeldust ei antud)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
@@@ -8601,81 -6873,64 +8627,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "vigane räsialgoritm `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "E-posti aadress: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Sisestage kasutaja ID.  Lõpetage tühja reaga: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Sisestage uus failinimi"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8817,7 -7041,6 +8843,7 @@@ msgstr "lisa see võtmehoidla võtmehoi
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|kasuta seda võtmeserverit"
@@@ -8905,17 -7112,14 +8931,17 @@@ msgstr "genereeri tühistamise sertifik
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -8979,7 -7172,6 +9005,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8993,168 -7184,138 +9019,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Allkiri aegus %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                 ka \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "See saab olema iseenda allkiri.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "näita sõrmejälge"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "halb sertifikaat"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "viga parooli loomisel: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "viga: vigane sõrmejälg\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "genereeri tühistamise sertifikaat"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9191,7 -7346,6 +9222,7 @@@ msgstr "võtmebloki kustutamine ebaõnn
  msgid "not removing file '%s'\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -9415,7 -7525,6 +9446,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9432,12 -7539,10 +9463,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "vigane vastus agendilt\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "faili ei õnnestu avada: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@@ -9487,148 -7583,119 +9518,148 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "allkirja kontroll jäeti ära\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "kirjutan faili `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@@ -9637,50 -7703,38 +9668,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "viga `%s' loomisel: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "võtit '%s' ei leitud: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "võtit '%s' ei leitud: %s\n"
@@@ -9833,116 -7858,88 +9864,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Väljun salvestamata? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9955,91 -7952,72 +9986,91 @@@ msgstr "
  "@\n"
  "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "kasuta: gpg [võtmed] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ei töödeldud"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10279,38 -8209,31 +10310,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "otsin \"%s\" HKP serverist %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: vigane faili versioon %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "faili ei õnnestu avada: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10343,255 -8260,199 +10374,251 @@@ msgstr "viga `%s' lugemisel: %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "võtit '%s' ei leitud: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "genereeri tühistamise sertifikaat"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: ei õnnestu kasutada: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "kasutan šiffrit %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "MÄRKUS: võti on tühistatud"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrollin trustdb faili\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "kontrolli allkirja"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10688,193 -8528,146 +10715,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|kasuta parooli moodi N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "viga parooli loomisel: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NIMI|krüpti NIMEle"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "võrgu viga"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "halb parool"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "ei leia avalikku võtit"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "viga `%s' lugemisel: %s\n"
diff --cc po/fi.po
index bfb2264,c6cae25..8782845
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -31,7 -30,6 +31,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -42,40 -40,31 +42,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "väärä salasana
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -93,75 -81,59 +93,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "väärä salasana"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "rivi on liian pitkä\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "salasana on liian pitkä\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Nimessä on epäkelpo merkki\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI ei kelpaa"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "väärä salasana"
@@@ -171,150 -142,115 +171,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "virhe luotaessa salasanaa: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muuta salasanaa"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Toista salasana: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Toista salasana: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Toista salasana: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -399,48 -321,33 +406,48 @@@ msgstr "
  "Valitsimet:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Avain on uusittu"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -525,11 -415,6 +532,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
@@@ -546,47 -429,34 +553,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ei voida luoda kohdetta %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -596,28 -465,22 +603,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@@ -645,7 -502,6 +652,7 @@@ msgstr "trustdb: luku epäonnistui (n=%
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: hakemistoa ei voi luoda: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -670,12 -522,10 +677,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "salaisen päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ohitettu: %s\n"
@@@ -697,8 -543,6 +704,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -706,9 -550,6 +713,9 @@@ msgstr "
  "@Komennot:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -762,8 -595,6 +769,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -822,8 -644,6 +829,8 @@@ msgstr "
  msgid "Yes"
  msgstr "kyllä|kylla|joo"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -874,19 -687,16 +881,19 @@@ msgstr "muuta salasanaa
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "ota avain käyttöön"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -906,7 -713,6 +913,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@@ -933,22 -735,14 +940,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -963,8 -755,6 +970,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -974,12 -763,10 +981,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@@ -1206,8 -947,6 +1213,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1343,7 -1055,10 +1350,12 @@@ msgstr "virhe trailer-rivissä\n
  msgid "[none]"
  msgstr "tuntematon "
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@@ -1419,7 -1120,6 +1431,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "ei käsitelty"
@@@ -1478,8 -1167,6 +1490,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1649,8 -1303,6 +1661,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1311,10 +1672,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Valintasi? "
  
@@@ -1735,17 -1367,11 +1747,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -1812,7 -1425,6 +1824,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@@ -1843,13 -1450,10 +1855,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "pyöristetty %u bittiin\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1904,9 -1498,6 +1916,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Valinta ei kelpaa.\n"
  
@@@ -2041,23 -1603,15 +2053,23 @@@ msgstr "Komento ei kelpaa (kirjoita \"h
  msgid "--output doesn't work for this command\n"
  msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1661,6 +2131,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -2157,7 -1692,6 +2169,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2286,40 -1796,31 +2298,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ohitettu: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "kirjoitetaan kohteeseen \"%s\"\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "VAROITUS: mitään ei viety\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2602,7 -2042,6 +2614,7 @@@ msgstr "|N|aseta pakkausaste N (0 poist
  msgid "use canonical text mode"
  msgstr "käytä tekstimuotoa"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
@@@ -2783,472 -2194,374 +2795,476 @@@ msgstr "VAROITUS: Hakemiston %s \"%s\" 
  msgid "unknown configuration item '%s'\n"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROITUS: %s korvaa %s:n\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ja %s yhdessä on järjetöntä!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "valittu tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed täytyy olla suurempi kuin 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "virheelliset oletusarvoiset valinnat\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ja %s eivät vielä toimi yhdessä\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "avaus epäonnistui: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "avaimen vienti epäonnistui: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ascii-koodauksen purku epäonnistui: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Kirjoita viestisi...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "annettu varmennekäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "ota avaimet tästä avainrenkaasta"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4601,15 -3649,10 +4617,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[mitätöity] "
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4649,7 -3686,6 +4665,7 @@@ msgstr "Haluatko edelleen varmasti lis�
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4681,7 -3711,6 +4697,7 @@@ msgstr[1] "%d allekirjoitus poistettu.\
  msgid "Nothing deleted.\n"
  msgstr "Mitään ei poistettu.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "virheellinen ascii-koodaus"
@@@ -4927,74 -3908,58 +4943,74 @@@ msgstr "
  "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
  "(käyttäjätunnus %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Valinnassa on luvaton merkki\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "kirjoitetaan suora allekirjoitus\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "kirjoitetaan oma-allekirjoitus\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "avaimen koko on pyöristetty %u bittiin\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "salaa tiedot"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5008,157 -3973,126 +5024,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Halutun avaimen koko on %u bittiä\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5174,7 -4108,6 +5190,7 @@@ msgstr "
  "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
  "     <n>y = Avain vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5190,40 -4123,32 +5206,40 @@@ msgstr "
  "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
  "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Avain on voimassa? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allekirjoitus on voimassa? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "arvo ei kelpaa\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s vanhenee %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allekirjoitus vanhenee %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5231,12 -4156,10 +5247,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Onko tämä oikein (k/e) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5247,7 -4170,6 +5263,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5265,50 -4187,39 +5281,50 @@@ msgstr "
  "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Oikea nimi: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Nimessä on epäkelpo merkki\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Nimi ei voi alkaa numerolla\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  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:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Sähköpostiosoite: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Huomautus: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Huomautuksessa on epäkelpo merkki\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5319,7 -4230,6 +5335,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5334,35 -4244,28 +5350,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnHhSsOoLl"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Ole hyvä ja korjaa ensin virhe\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5374,13 -4277,10 +5390,13 @@@ msgstr "
  "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
  "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5388,66 -4288,53 +5404,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "luo uusi avainpari"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Avaimen luonti keskeytetty.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "HUOM: salainen avain %08lX vanheni %s\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5456,7 -4343,6 +5472,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5464,7 -4350,6 +5480,7 @@@ msgstr "
  "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5472,22 -4357,18 +5488,22 @@@ msgstr "
  "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Haluatko varmasti luoda? "
@@@ -5570,26 -4435,22 +5586,26 @@@ msgstr "     Avaimen sormenjälki =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "tarkistetaan avainrengasta \"%s\"\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
  msgstr[1] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5597,7 -4458,6 +5613,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 väärä allekirjoitus\n"
  msgstr[1] "1 väärä allekirjoitus\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: avainrengas luotu\n"
@@@ -5902,7 -4700,6 +5918,7 @@@ msgstr "binääri
  msgid "textmode"
  msgstr "teksti"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "tuntematon "
  
@@@ -6124,55 -4879,44 +6140,55 @@@ msgstr "VAROITUS: mahdollisesti turvato
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Syötä salasana\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "käyttäjän peruma\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (pääavaimen tunnus %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6612,17 -5273,14 +6628,17 @@@ msgstr "vanhaa DEK-koodaus ei tueta\n
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "HUOM: salainen avain %08lX vanheni %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6921,18 -5530,15 +6937,18 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "allekirjoitetaan:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "käytetään %s-salausta\n"
@@@ -6997,17 -5592,14 +7013,17 @@@ msgstr "virhe: sormenjälki on väärä
  msgid "ownertrust value missing"
  msgstr "tuo luottamusasteet"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "virhe etsittäessä luottamustietuetta: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronointi epäonnistui: %s\n"
@@@ -7041,7 -5627,6 +7057,7 @@@ msgstr "trustdb-tapahtuma on liian suur
  msgid "%s: directory does not exist!\n"
  msgstr "%s: hakemistoa ei ole olemassa!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -7184,10 -5741,6 +7200,10 @@@ msgstr "virhe luotaessa salasanaa: %s\n
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7219,7 -5767,6 +7235,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7391,11 -5911,9 +7407,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7404,121 -5921,101 +7420,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d allekirjoitusta poistettu.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "salattu %lu salasanalla\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Käytäntö: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7535,18 -6032,14 +7551,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7597,56 -6081,45 +7613,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "trustdb:n tarkistusta ei tarvita\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "seuraava trustdb tarkistus %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "julkista avainta %08lX ei löydy: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "tee --check-trustdb, kiitos\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "tarkistetaan trustdb:tä\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7654,22 -6127,18 +7670,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7783,19 -6231,14 +7799,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7844,7 -6278,6 +7860,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -7859,69 -6290,67 +7875,84 @@@ msgstr "TrustDB:n alustaminen ei onnist
  msgid "failed to store the creation date: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7930,27 -6359,22 +7961,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "muuta salasanaa"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "muuta salasanaa"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7958,118 -6382,94 +7989,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI-muotoa ei tueta"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@@ -8090,57 -6487,45 +8121,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "älä käytä lainkaan päätettä"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "ristiriitainen komento\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8150,22 -6534,14 +8181,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -8184,12 -6557,10 +8210,12 @@@ msgstr "
  msgid "shell"
  msgstr "apua"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8202,12 -6571,10 +8228,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@@ -8235,9 -6597,6 +8261,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8260,12 -6615,10 +8286,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8278,7 -6629,6 +8304,7 @@@ msgstr "kirjoitan salaisen avaimen koht
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Tämä avain on vanhentunut!"
@@@ -8334,7 -6673,6 +8360,7 @@@ msgstr "virheellinen varmenne
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "näytä sormenjälki"
@@@ -8364,7 -6696,6 +8390,7 @@@ msgstr "luo mitätöintivarmenne
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8373,29 -6703,23 +8399,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "tarkista allekirjoitus"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "valinta %c%lu on kopio\n"
@@@ -8424,11 -6743,9 +8450,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "ei"
@@@ -8464,36 -6776,28 +8490,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8587,72 -6873,58 +8613,72 @@@ msgstr "virhe luotaessa avainrengasta \
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (vain allekirjoitus)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "poista avain käytöstä"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Kuvausta ei annettu)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
@@@ -8662,81 -6934,64 +8688,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Sähköpostiosoite: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Syötä uusi tiedostonimi"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Luo tälle avaimelle mitätöintivarmenne? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8878,7 -7102,6 +8904,7 @@@ msgstr "lisää tämä avainrengas avai
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
@@@ -8966,17 -7173,14 +8992,17 @@@ msgstr "luo mitätöintivarmenne
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -9040,7 -7233,6 +9066,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9054,168 -7245,138 +9080,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                aka \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Tämä tulee olemaan oma-allekirjoitus.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "näytä sormenjälki"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "virheellinen varmenne"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "virhe luotaessa salasanaa: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "luo mitätöintivarmenne"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -9252,7 -7407,6 +9283,7 @@@ msgstr "avainlohkojen poisto epäonnist
  msgid "not removing file '%s'\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -9477,7 -7587,6 +9508,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9494,12 -7601,10 +9525,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "agentin lähettämä vastaus ei kelpaa\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "ei voi avata tiedostoa: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@@ -9549,149 -7645,120 +9580,149 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "allekirjoituksen varmistus vaiennetaan\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "salaisen päivitys epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "kirjoitetaan kohteeseen \"%s\"\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
  "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@@ -9700,50 -7766,38 +9731,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "virhe luotaessa \"%s\": %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
@@@ -9896,116 -7921,88 +9927,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Lopeta tallentamatta muutoksia?"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10019,91 -8016,72 +10050,91 @@@ msgstr "
  "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
  "sivuilta)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "käyttö: gpg [valitsimet] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ei käsitelty"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10343,38 -8273,31 +10374,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: tiedostoversio %d ei kelpaa\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "ei voi avata tiedostoa: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "salaisen päivitys epäonnistui: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10407,255 -8324,199 +10438,251 @@@ msgstr "virhe luettaessa tiedostoa \"%s
  msgid "error building OCSP request: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "luo mitätöintivarmenne"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: kohteeseen ei päästä: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "käytetään salakirjoitusalgoritmia %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "HUOM: avain on mitätöity!"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "tarkistetaan trustdb:tä\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "tarkista allekirjoitus"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10752,193 -8592,146 +10779,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|käytä salasanoissa toimintatapaa N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NIMI|salaa vastaanottajalle NIMI"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "verkkovirhe"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "väärä salasana"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "julkista avainta ei löydy"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
diff --cc po/fr.po
index d58a1ab,d8aea0d..6ebabc7
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -18,7 -17,6 +18,7 @@@
  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  "X-Generator: Lokalize 1.5\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@@ -29,48 -27,39 +29,48 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Annuler"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|Code personnel :"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Annuler"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr ""
  "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "phrase de passe incorrecte
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Qualité :"
  
@@@ -88,13 -76,11 +88,13 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "La qualité du texte entré ci-dessus.\n"
  "Veuillez demander à votre administrateur des précisions sur les critères."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -102,7 -88,6 +102,7 @@@ msgstr "
  "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
  "pendant cette session"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -110,53 -95,40 +110,53 @@@ msgstr "
  "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
  "pendant cette session"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Phrase secrète :"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "ne correspond pas — veuillez réessayer"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (essai %d sur %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Répéter :"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "Code personnel trop long"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Phrase secrète trop longue"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Caractères incorrects dans le code personnel"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "Code personnel trop court"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Mauvais code personnel"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Mauvaise phrase secrète"
  
@@@ -165,49 -136,35 +165,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "impossible d'ouvrir « %s » : %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "erreur de lecture du numéro de série de la carte : %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "carte détectée avec le numéro de série : %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "aucune clef d'authentification pour SSH sur la carte : %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "erreur de lecture des options stockées : %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -216,24 -173,19 +224,24 @@@ msgstr "
  "Un processus SSH demande à utiliser la clef%%0A  %s%%0A  (%s)%%0AVoulez-vous "
  "l'autoriser ?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Autoriser"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Refuser"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Veuillez répéter cette phrase secrète"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -242,70 -194,55 +250,70 @@@ msgstr "
  "Veuillez entrer une phrase secrète pour protéger la clef secrète%%0A   %s"
  "%%0A   %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "échec de création du flux à partir de cette socket : %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Code personnel d'administration"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "CDP"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Code de réinitialisation"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Répétez ce code de réinitialisation"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Répétez ce code de déblocage personnel"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Répétez ce code personnel"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr ""
  "les codes de réinitialisation ne correspondent pas ; veuillez réessayer"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr ""
  "les codes de déblocage personnels ne correspondent pas ; veuillez réessayer"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "erreur de création du fichier temporaire : %s\n"
@@@ -393,47 -316,32 +401,47 @@@ msgstr "
  "@Options :\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "exécuter en mode serveur (premier plan)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, 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:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sortie de commandes à la sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "sortie de commandes à la csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "ne pas détacher de la console"
  
@@@ -513,11 -404,6 +521,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -535,43 -419,30 +543,43 @@@ msgstr "
  "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
  "Gestionnaire de clefs secrètes pour @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "niveau de débogage « %s » incorrect\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "fichier d'options « %s » : %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "lecture des options de « %s »\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossible de créer la socket : %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "le nom de la socket « %s » est trop long\n"
@@@ -582,28 -452,22 +590,28 @@@ msgstr "
  "une instance de gpg-agent fonctionne déjà —\n"
  "pas de démarrage d'une nouvelle instance\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "erreur de lecture du « nonce » de la socket\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erreur de lien de la socket à « %s » : %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "échec de listen() : %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "écoute sur la socket « %s »\n"
@@@ -630,7 -488,6 +638,7 @@@ msgstr "échec de stat() pour « %s �
  msgid "can't use '%s' as home directory\n"
  msgstr "impossible d'utiliser « %s » comme répertoire personnel\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
@@@ -655,12 -508,10 +663,12 @@@ msgstr "gestionnaire SSH 0x%lx pour le 
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "échec de npth_pselect : %s — attente 1 s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s arrêté\n"
@@@ -684,8 -531,6 +692,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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -538,6 +701,9 @@@ msgstr "
  "@Commandes :\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -751,8 -585,6 +759,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -812,8 -635,6 +820,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Oui"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Non"
  
@@@ -869,7 -683,6 +877,7 @@@ msgstr "Modifier la phrase secrète
  msgid "I'll change it later"
  msgstr "Je la modifierai plus tard"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -877,11 -690,9 +885,11 @@@
  "%%0A?"
  msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Supprimer la clef"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -906,7 -714,6 +914,7 @@@ msgid "a %zu bit hash is not valid for 
  msgstr ""
  "un hachage de %1$zu bits n'est pas valable pour une clef %3$s de %2$u bits\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "échec de vérification de la signature créée : %s\n"
@@@ -931,22 -734,14 +939,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erreur de création d'un tube : %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "erreur de création d'un flux pour un tube : %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "erreur de création de processus fils : %s\n"
@@@ -961,8 -754,6 +969,8 @@@ msgstr "échec d'attente de fin du proc
  msgid "error running '%s': probably not installed\n"
  msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erreur d'exécution de « %s » : code de retour %d\n"
@@@ -972,13 -762,11 +980,13 @@@
  msgid "error running '%s': terminated\n"
  msgstr "erreur d'exécution de « %s » : terminé\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "échec d'attente de fin du processus %d : %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erreur de lecture du code de retour du processus %d : %s\n"
@@@ -1195,8 -937,6 +1203,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algorithme non pris en charge : %s"
@@@ -1316,7 -1029,10 +1324,12 @@@ msgstr "ligne inutile ignorée
  msgid "[none]"
  msgstr "[aucun]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "caractère %02x incorrect en radix64, ignoré\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "argument inattendu"
  
@@@ -1382,7 -1084,6 +1395,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "hors limite\n"
  
@@@ -1440,8 -1130,6 +1453,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@@ -1607,8 -1262,6 +1620,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1268,9 +1629,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Quel est votre choix ? "
  
@@@ -1685,16 -1318,10 +1698,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "erreur de lecture de « %s » : %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erreur d'écriture de « %s » : %s\n"
@@@ -1756,7 -1370,6 +1769,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr ""
@@@ -1793,13 -1401,10 +1806,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
@@@ -1855,9 -1450,6 +1868,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Choix incorrect.\n"
  
@@@ -1986,22 -1549,14 +1999,22 @@@ msgstr "Commande incorrecte (essayez «
  msgid "--output doesn't work for this command\n"
  msgstr "--output n'est pas compatible avec cette commande\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1603,6 +2073,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erreur de création de la phrase secrète : %s\n"
@@@ -2097,7 -1633,6 +2110,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2227,36 -1738,27 +2240,36 @@@ msgstr "supprimer autant que possible d
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " — ignoré"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "écriture de « %s »\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "clef %s : matériel de clef sur la carte — ignorée\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "il est interdit d'exporter les clefs secrètes\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "Attention : rien n'a été exporté\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2527,7 -1968,6 +2540,7 @@@ msgstr "|N|niveau de compression N (0 d
  msgid "use canonical text mode"
  msgstr "utiliser le mode texte canonique"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FICHIER|écrire la sortie dans le FICHIER"
  
@@@ -2725,461 -2137,363 +2738,465 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "élément de configuration « %s » inconnu\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "montrer les photos d'identité en affichant les clefs"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "montrer les URL de politique en affichant les signatures"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "montrer toutes les notations en affichant les signatures"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "utiliser les notations aux normes IETF en affichant les signatures"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en affichant les signatures"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "montrer les URL des serveurs de clefs favoris en affichant les signatures"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "indiquer la validité de l'identité en affichant les clefs"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  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:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "montrer le nom du porte-clefs en affichant les clefs"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "montrer les dates d'expiration en affichant les signatures"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "option « %s » inconnue\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "mode pinentry « %s » incorrect\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s : %d : options d'importation incorrectes\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "options d'importation incorrectes\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s : %d : options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s : %d : options de liste incorrectes\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "montrer les photos d'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "montrer les URL de politique en vérifiant les signatures"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "montrer toutes les notations en vérifiant les signatures"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  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:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "indiquer la validité de l'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  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:3239
++#: g10/gpg.c:3243
  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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "valider les signatures avec les données PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  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:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s : %d : options de vérification incorrectes\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "options de vérification incorrectes\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, 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:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "liste de recherche automatique de clef incorrecte\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Attention : %s remplace %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s n'est pas permis avec %s.\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s n'a aucun sens avec %s.\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "Attention : exécution avec un système de temps contrefait : "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorithme de compression sélectionné est incorrect\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "« completes-needed » doit être supérieur à 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "« marginals-needed » doit être supérieur à 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "préférences par défaut incorrectes\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "préférences personnelles de chiffrement incorrectes\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "préférences personnelles de hachage incorrectes\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "préférences personnelles de compression incorrectes\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne fonctionne pas encore avec %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "impossible d'initialiser la base de confiance : %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "échec du chiffrement symétrique de « %s » : %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "échec de réception depuis le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "échec d'exportation de la clef : %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "échec de recherche au sein du serveur de clefs : %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "échec de déconstruction d'une armure : %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "échec de construction d'une armure : %s \n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algorithme de hachage « %s » incorrect\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Vous pouvez taper votre message…\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "l'URL de politique de certification donnée est incorrecte\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "l'URL de politique de signature donnée est incorrecte\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  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"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FICHIER|prendre les clefs dans le porte-clefs FICHIER"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "convertir les conflits de date en avertissements"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|écrire l'état sur ce descripteur"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Utilisation : gpgv [options] [fichiers] (-h pour l'aide)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4489,14 -3538,9 +4506,14 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "révoquée"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "expirée"
  
@@@ -4535,7 -3573,6 +4552,7 @@@ msgid "You may not add a photo ID to a 
  msgstr ""
  "Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Cette identité existe déjà pour cette clef.\n"
  
@@@ -4567,7 -3598,6 +4584,7 @@@ msgstr[1] "%d signature supprimée.\n
  msgid "Nothing deleted.\n"
  msgstr "Rien n'a été supprimé.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "incorrecte"
  
@@@ -4814,74 -3796,58 +4831,74 @@@ msgstr "
  "Affichage de la photo d'identité %s de taille %ld pour la clef\n"
  "%s (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "préférence « %s » en double\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "trop de préférences de chiffrement\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "trop de préférences de hachage\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "trop de préférences de compression\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "écriture de la signature directe\n"
  
  # g10/keygen.c:123 ???
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "écriture de l'autosignature\n"
  
  # g10/keygen.c:161 ???
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "écriture de la signature de lien à la clef\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "taille incorrecte ; utilisation de %u bits\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "taille arrondie à %u bits\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Signer"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certifier"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Chiffrer"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Authentifier"
  
@@@ -4895,150 -3861,119 +4912,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsCcAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Actions possibles pour une clef %s : "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Actions actuellement permises : "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Inverser la capacité de signature\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Inverser la capacité de chiffrement\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Inverser la capacité d'authentification\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminé\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Sélectionnez le type de clef désiré :\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA et RSA (par défaut)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA et Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (signature seule)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (signature seule)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (chiffrement seul)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (chiffrement seul)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC et ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (signature seule)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (chiffrement seul)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Clef existante\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Entrez le keygrip : "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  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:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Pas de clef avec ce keygrip\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quelle taille de clef désirez-vous ? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La taille demandée est %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5054,7 -3989,6 +5071,7 @@@ msgstr "
  "      <n>m = la clef expire dans n mois\n"
  "      <n>y = la clef expire dans n ans\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5071,38 -4005,30 +5088,38 @@@ msgstr "
  "      <n>m = la signature expire dans n mois\n"
  "      <n>y = la signature expire dans n ans\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valeur incorrecte\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "La clef n'expire pas du tout\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "La signature n'expire pas du tout\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clef expire le %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La signature expire le %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5110,11 -4036,9 +5127,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Est-ce correct ? (o/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5128,7 -4052,6 +5145,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5144,49 -4067,38 +5161,49 @@@ msgstr "
  "   « Heinrich Heine (le poète) <heinrichh at duesseldorf.de> »\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nom réel : "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Caractère incorrect dans le nom\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Le nom ne doit pas commencer par un chiffre\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Le nom doit contenir au moins cinq caractères\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Adresse électronique : "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Ce n'est pas une adresse électronique valable\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Commentaire : "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Caractère incorrect dans le commentaire\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Vous utilisez le jeu de caractères « %s ».\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5197,7 -4109,6 +5214,7 @@@ msgstr "
  "    « %s »\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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 "
@@@ -5214,34 -4125,27 +5231,34 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcAaOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Veuillez d'abord corriger l'erreur\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5253,13 -4157,10 +5270,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Échec de génération de la clef : %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5270,64 -4171,51 +5287,64 @@@ msgstr "
  "   « %s »\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Faut-il continuer ? (O/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Une clef pour « %s » existe déjà\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Faut-il quand même créer ? (o/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "création quand même\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, 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:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "La génération de clef a été annulée.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "écriture de la clef publique dans « %s »\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  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"
@@@ -5336,7 -4224,6 +5353,7 @@@ msgstr "
  "pouvez\n"
  "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5344,7 -4231,6 +5361,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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5352,22 -4238,18 +5369,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Faut-il vraiment la créer ? (o/N) "
  
@@@ -5449,12 -4315,10 +5466,12 @@@ msgstr " Empreinte de la clef =
  msgid "      Card serial no. ="
  msgstr " Nº de série de carte ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "mise en cache du porte-clefs « %s »\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5462,7 -4326,6 +5479,7 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
  msgstr[1] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "flush the cache"
  msgid "%lu key cached"
@@@ -5470,7 -4333,6 +5487,7 @@@ msgid_plural "%lu keys cached
  msgstr[0] "vider le cache"
  msgstr[1] "vider le cache"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5478,7 -4340,6 +5495,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 mauvaise signature\n"
  msgstr[1] "1 mauvaise signature\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s : porte-clefs créé\n"
@@@ -5780,7 -4579,6 +5797,7 @@@ msgstr "binaire
  msgid "textmode"
  msgstr "mode texte"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "inconnu"
  
@@@ -6002,59 -4758,48 +6019,59 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "un sous-paquet de type %d possède un bit critique\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problème avec l'agent : %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Entrez la phrase secrète\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "annulé par l'utilisateur\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (identifiant de clef principale %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr ""
  "Veuillez entrer la phrase secrète pour déverrouiller la clef secrète "
  "OpenPGP :"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr ""
  "Veuillez entrer la phrase secrète pour importer la clef secrète OpenPGP :"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr ""
  "Veuillez entrer la phrase secrète pour exporter la sous-clef secrète "
  "OpenPGP :"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr ""
  "Veuillez entrer la phrase secrète pour exporter la clef secrète OpenPGP :"
  
  # NOTE:  s/subkey key/subkey/
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr ""
  "Voulez-vous vraiment supprimer de façon permanente la sous-clef secrète "
  "OpenPGP :"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr ""
  "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6500,19 -5162,16 +6517,19 @@@ msgstr "
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "Attention : l'algorithme de chiffrement %s est introuvable\n"
  "            dans les préférences du destinataire\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "Remarque : la clef secrète %s a expiré le %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "Remarque : la clef a été révoquée"
  
@@@ -6844,7 -5454,6 +6861,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s signature de : « %s »\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6852,11 -5461,9 +6869,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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "signature :"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "le chiffrement %s sera utilisé\n"
@@@ -6917,17 -5513,14 +6934,17 @@@ msgstr "empreinte incorrecte
  msgid "ownertrust value missing"
  msgstr "valeur de confiance au propriétaire manquante"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "impossible de trouver l'enregistrement de confiance dans « %s » : %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "erreur de lecture dans « %s » : %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de confiance : échec de synchronisation : %s\n"
@@@ -6962,7 -5549,6 +6979,7 @@@ msgstr "transaction de base de confianc
  msgid "%s: directory does not exist!\n"
  msgstr "%s : le répertoire n'existe pas.\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -7103,10 -5661,6 +7120,10 @@@ msgstr "erreur de création du fichier 
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7141,7 -5690,6 +7158,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7320,11 -5841,9 +7337,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7334,79 -5852,67 +7351,79 @@@
  msgid "resetting keydb: %s\n"
  msgstr "erreur d'écriture la clef : %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %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:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "erreur de création d'un tube : %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d signatures supprimées\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7414,13 -5920,11 +7431,13 @@@ msgid_plural "%s: Verified %ld~signatur
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "chiffré avec %lu phrases secrètes\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7428,31 -5932,25 +7445,31 @@@ msgid_plural "Encrypted %ld~messages i
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "validité : %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7469,19 -5967,15 +7486,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7532,55 -6017,45 +7549,55 @@@ msgstr "
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "utilisation du modèle de confiance %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "inutile de vérifier la base de confiance\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "clef publique %s introuvable : %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "veuillez faire un --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "vérification de la base de confiance\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7588,7 -6063,6 +7605,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7596,16 -6070,13 +7613,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "aucune clef de confiance ultime n'a été trouvée\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7613,7 -6084,6 +7630,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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7728,19 -6177,14 +7745,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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"
@@@ -7797,7 -6232,6 +7814,7 @@@ msgstr "
  "|P|Veuillez entrer le code de déblocage personnel (CDP) pour permettre à la "
  "clef de créer des signatures qualifiées."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erreur de lecture du nouveau code personnel : %s\n"
@@@ -7812,72 -6244,72 +7829,89 @@@ msgstr "impossible de stocker l'emprein
  msgid "failed to store the creation date: %s\n"
  msgstr "impossible de stocker la date de création : %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ 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:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "la réponse ne contient pas le module RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  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:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  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:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "échec de lecture de clef publique : %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, 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:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, 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:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Veuillez entrer le code personnel"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "échec de vérification CHV%d : %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- 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:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "la carte est irrémédiablement bloquée.\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7891,27 -6323,19 +7925,24 @@@ msgstr[1] "
  "avant que la carte ne soit irrémédiablement bloquée\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Veuillez entrer le code personnel d'administration"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  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:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Veuillez entrer le code personnel"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7921,83 -6345,65 +7952,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nouveau code de réinitialisation"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nouveau code personnel d'administration"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Nouveau code personnel"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  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:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "erreur de lecture des données d'application\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "erreur de lecture de l'empreinte DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "la clef existe déjà\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "la clef existante sera remplacée\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "génération d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "écriture d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "la date de création est manquant\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "impossible de stocker la clef : %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non pris en charge"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  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:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "échec de génération de la clef\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8005,32 -6411,26 +8036,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signatures créées jusqu'à présent : %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -8052,51 -6449,39 +8083,51 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FICHIER|écrire un journal dans le FICHIER"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|se connecter au lecteur par le port N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOM|utiliser NOM comme pilote ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOM|utiliser NOM comme pilote PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "ne pas utiliser le pilote CCID interne"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|déconnecter la carte après N secondes d'inactivité "
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "ne pas utiliser de pavé numérique du lecteur"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "refus d'utiliser les commandes d'administration de la carte"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "utiliser une entrée de taille variable pour le pavé numérique"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8110,22 -6494,14 +8141,17 @@@ msgstr "
  "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
  "en arrière-plan\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "gestionnaire pour le descripteur %d démarré\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "gestionnaire pour le descripteur %d terminé\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "caractère %02x incorrect en radix64, ignoré\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8145,12 -6518,10 +8171,12 @@@ msgstr "chaîne
  msgid "shell"
  msgstr "invite"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "l'extension de certificat critique %s n'est pas prise en charge"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  "le certificat d'émetteur n'est pas marqué comme une autorité de certification"
@@@ -8164,11 -6533,9 +8190,11 @@@ msgstr "politique de signature marqué
  msgid "failed to open '%s': %s\n"
  msgstr "échec d'ouverture de « %s » : %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Remarque : politique de certificat non critique non autorisée"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "politique de certificat non autorisée"
  
@@@ -8195,9 -6557,6 +8221,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8218,12 -6573,10 +8244,12 @@@ msgstr "veuillez vous assurer que le «
  msgid "checking the CRL failed: %s"
  msgstr "échec de vérification de la liste de révocations de certificat : %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certificat avec validité incorrecte : %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "certificat pas encore valable"
  
@@@ -8235,7 -6586,6 +8261,7 @@@ msgstr "certificat racine pas encore va
  msgid "intermediate certificate not yet valid"
  msgstr "certificat intermédiaire pas encore valable"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "le certificat a expiré"
  
@@@ -8285,7 -6624,6 +8311,7 @@@ msgstr "  (certificat valable depuis 
  msgid "  (     issuer valid from "
  msgstr "  (  émetteur valable depuis "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "empreinte=%s\n"
@@@ -8316,7 -6648,6 +8342,7 @@@ msgstr "aucun émetteur trouvé dans l
  msgid "self-signed certificate has a BAD signature"
  msgstr "certificat autosigné avec une mauvaise signature"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "le certificat racine n'est pas marqué de confiance"
  
@@@ -8325,32 -6655,26 +8351,32 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "échec de vérification de la liste de confiance : %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "chaîne de certificats trop longue\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "certificat d'émetteur introuvable"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "certificat avec une mauvaise signature"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "un autre certificat d'autorité de certification pouvant correspondre a été "
  "trouvé — nouvel essai"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  "chaîne de certificats plus longue que celle autorisée par l'autorité de "
  "certification (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "le certificat est correct\n"
  
@@@ -8377,11 -6696,9 +8403,11 @@@ msgid "a %u bit hash is not valid for 
  msgstr ""
  "un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(c'est l'algorithme MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "aucun"
  
@@@ -8417,40 -6729,32 +8443,40 @@@ msgstr "
  "numéro de série %s, identifiant 0x%08lX,\n"
  "créé le %s, expire le %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  "aucune utilisation de clef indiquée — toutes les utilisations sont "
  "supposées\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "le certificat n'aurait pas dû être utilisé pour la certification\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  "le certificat n'aurait pas dû être utilisé pour la signature de réponse "
  "OCSP\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "le certificat n'aurait pas dû être utilisé pour le chiffrement\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "le certificat n'aurait pas dû être utilisé pour la signature\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "le certificat n'est pas utilisable pour la signature\n"
  
@@@ -8545,7 -6831,6 +8571,7 @@@ msgstr "ligne %d : erreur de lecture 
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "ligne %d : échec de génération de la clef : %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8553,64 -6838,51 +8579,64 @@@ msgstr "
  "Pour terminer cette demande de certificat, veuillez entrer encore une fois "
  "la phrase secrète pour la clef que vous venez de créer.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Clef existante\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Clef existante sur la carte\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "erreur de lecture de la carte : %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Numéro de série de la carte : %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Clefs disponibles :\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Actions possibles pour une clef %s :\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) signer, chiffrer\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) signer\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) chiffrer\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Entrez le nom de sujet X.509 : "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Aucun nom de sujet donné\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Étiquette de nom de sujet « %.*s » incorrecte\n"
@@@ -8620,74 -6892,57 +8646,74 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Nom de sujet « %s » incorrect\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "15"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Entrez l'adresse électronique"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (terminez par une ligne vide) :\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Entrez les noms de DNS"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (facultatif, terminez par une ligne vide) :\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Entrez les URI"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Faut-il créer un certificat autosigné ? (o/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Ces paramètres seront utilisés :\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Création de certificat autosigné. "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Création de la demande de certificat. "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "Cela risque de prendre un peu de temps…\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Prêt.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Prêt. Vous devriez maintenant envoyer cette demande à l'autorité de "
  "certification.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "problème de ressources : hors limite\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(c'est l'algorithme RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(ça ne ressemble pas à un message chiffré)\n"
  
@@@ -8820,7 -7044,6 +8846,7 @@@ msgstr "|FICHIER|ajouter le trousseau �
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
  
@@@ -8902,17 -7109,14 +8928,17 @@@ msgstr "erreur de stockage du certifica
  msgid "basic certificate checks failed - not imported\n"
  msgstr "échec des vérifications de base du certificat — non importé\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "erreur de lecture des options stockées : %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "erreur d'importation du certificat : %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "erreur de lecture de l'entrée : %s\n"
@@@ -8984,7 -7177,6 +9010,7 @@@ msgstr "
  "\n"
  "%s%sVoulez-vous vraiment faire cela ?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9004,164 -7195,135 +9030,170 @@@ msgstr "
  "« %s »\n"
  "Remarquez que ce certificat ne va pas créer de signature qualifiée."
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "l'algorithme de hachage %d (%s) pour le signataire %d n'est pas pris en "
  "charge ; utilisation de %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "algorithme de hachage utilisé pour le signataire %d : %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "échec de vérification de certificat qualifié : %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Signature faite le "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[date non donnée]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " en utilisant le certificat d'identifiant 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "signature incorrecte : l'attribut de hachage du message ne correspond pas à "
  "celui calculé\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Bonne signature de"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                alias"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "C'est une signature qualifiée\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "impossible d'initialiser le verrou du cache de certificat : %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  "impossible d'obtenir le verrou de lecture du cache de certificat : %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  "impossible d'obtenir le verrou d'écriture du cache de certificat : %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "impossible de libérer le verrou du cache de certificat : %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "abandon de %u certificats du cache\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "impossible d'analyser le certificat « %s » : %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "certificat « %s » déjà en cache\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "certificat de confiance « %s » chargé\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "certificat « %s » chargé\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  empreinte SHA1 = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr " émetteur ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "    sujet ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "erreur de chargement du certificat « %s » : %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificats chargés de façon permanente : %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "      certificats actuellement en cache : %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "      certificats actuellement en cache : %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "certificat déjà en cache\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "certificat en cache\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "erreur de mise en cache du certificat : %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "chaîne « %s » d'empreinte SHA1 incorrecte\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "erreur de récupération du certificat par numéro de série : %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "erreur de récupération du certificat par sujet : %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "aucun émetteur trouvé dans le certificat\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "erreur de lecture d'authorityKeyIdentifier : %s\n"
@@@ -9196,7 -7352,6 +9228,7 @@@ msgstr "suppression du fichier de cach
  msgid "not removing file '%s'\n"
  msgstr "pas de suppression du fichier « %s »\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "erreur de fermeture du fichier de cache : %s\n"
@@@ -9436,7 -7547,6 +9468,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "erreur de lecture des données du fichier de cache : %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "algorithme de hachage « %s » inconnu\n"
@@@ -9450,12 -7558,10 +9482,12 @@@ msgstr "échec de gcry_md_open pour l'a
  msgid "got an invalid S-expression from libksba\n"
  msgstr "expression symbolique incorrecte obtenue de libksba\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "échec de conversion d'expression symbolique : %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "échec de création d'expression symbolique : %s\n"
@@@ -9514,90 -7611,74 +9546,90 @@@ msgstr "
  "échec de vérification de signature de liste de révocations de certificat : "
  "%s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr ""
  "erreur de vérification de la validité du certificat d'émetteur de liste de "
  "révocations : %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "échec de ksba_crl_new : %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "échec de ksba_crl_set_reader : %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "vieux fichier de cache temporaire « %s » supprimé\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr ""
  "problème de suppression du vieux fichier de cache temporaire « %s » : %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "erreur de création du fichier de cache temporaire « %s » : %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "échec de crl_parse_insert : %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "erreur de finalisation du fichier de cache temporaire « %s » : %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "erreur de fermeture du fichier de cache temporaire « %s » : %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "Attention : la nouvelle liste de révocations de certificat est trop "
  "ancienne ; elle a expiré le %s — chargement quand même\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  "la nouvelle liste de révocations de certificat est trop ancienne ; elle a "
  "expiré le %s\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "extension %s de liste de révocations de certificat critique inconnue\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr ""
  "erreur de lecture des extensions de liste de révocations de certificat : %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "création du fichier de cache « %s »\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "problème en renommant « %s » en « %s » : %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9605,14 -7686,12 +9637,14 @@@ msgstr "
  "échec de mise à jour du fichier DIR — l'entrée de cache sera perdue avec le "
  "prochain démarrage du programme\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  "Démarrage du vidage de liste de révocations de certificat (récupérée par "
  "%s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
@@@ -9620,58 -7699,47 +9652,58 @@@ msgstr "
  " Erreur : la liste de révocations de certificat ne sera pas utilisée car "
  "elle était encore trop ancienne après une mise à jour.\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  " Erreur : la liste de révocations de certificat ne sera pas utilisée à cause "
  "d'une extension critique inconnue.\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  " Erreur : la liste de révocations de certificat ne sera pas utilisée.\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  " Erreur : cette liste de révocations de certificat en cache a pu être "
  "modifiée.\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " Attention : taille d'enregistrement de cache incorrecte\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "problème de lecture d'enregistrement de cache : %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "problème de lecture d'enregistrement de clef : %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "erreur de lecture de l'entrée de cache dans la base de données : %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Fin du vidage de liste de révocations de certificat\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "échec de crl_fetch par points de distribution : %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "échec de crl_cache_insert par points de distribution : %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@@ -9680,45 -7747,34 +9712,45 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "table de projection de lecteur vers fichier pleine — attente\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "utilisation d'« http » au lieu d'« https »\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  msgid "CRL access not possible due to disabled %s\n"
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "URL « %s » redirigée vers « %s » (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "trop de redirections\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "erreur de récupération de « %s » : %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "erreur de récupération de « %s » : état HTTP %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "CRL access not possible due to disabled %s\n"
  msgid "CRL access not possible due to Tor mode\n"
@@@ -9726,7 -7782,6 +9758,7 @@@ msgstr "
  "accès à la liste de révocations de certificat impossible car %s est "
  "désactivé\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "recherche de certificats impossible car %s est désactivé\n"
@@@ -9869,120 -7895,92 +9901,120 @@@ msgstr "nom de fichier absolu attendu\n
  msgid "looking up '%s'\n"
  msgstr "recherche de « %s »\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  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:161
++#: dirmngr/dirmngr.c:163
  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:162
++#: dirmngr/dirmngr.c:164
  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:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "arrêter le dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "vider le cache"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "exécuter sans demander à l'utilisateur"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "permettre l'envoi de requêtes OCSP"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "interdire l'utilisation d'HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "interdire l'utilisation de LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "HTTP"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "LDAP"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer les URL de service OCSP contenues dans le certificat"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|utiliser le répondeur OCSP à l'URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|EMPR|réponse OCSP signée par EMPR"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  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:223
++#: dirmngr/dirmngr.c:225
  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:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9992,11 -7990,9 +10024,11 @@@ msgstr "
  "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
  "et options)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -10005,79 -8001,62 +10037,79 @@@ msgstr "
  "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
  "@GNUPG@\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "les niveaux de débogage possibles sont : %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "utilisation : %s [options] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s : %u : erreur de lecture : %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, 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:1776
  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:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 reçu — aucune action définie\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM reçu — arrêt…\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM reçu — encore %d connexions actives\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "arrêt forcé\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT reçu — arrêt immédiat\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d reçu — aucune action définie\n"
@@@ -10308,35 -8239,28 +10340,35 @@@ msgstr "caractère 0x%02x incorrect dan
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "ajout de « %s : %d » à la liste de serveurs LDAP\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "échec de malloc : %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch : motif « %s » incorrect\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search a atteint la taille limite du serveur\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "expression symbolique canonique incorrecte trouvée\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "échec de gcry_md_open : %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "erreur : échec de ksba_cert_hash : %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "mauvais encodage d'URL détecté\n"
  
@@@ -10370,249 -8288,193 +10402,245 @@@ msgstr "erreur de configuration de la c
  msgid "error building OCSP request: %s\n"
  msgstr "erreur de construction de la requête OCSP : %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "erreur de connexion à « %s » : %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "erreur de lecture de réponse HTTP pour « %s » : %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "erreur d'accès à « %s » : état HTTP %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "erreur d'analyse de réponse OCSP pour « %s » : %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "répondeur OCSP à l'état « %s » : %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "échec de hachage de la réponse OCSP pour « %s » : %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "non signée par un certificat de signataire OCSP par défaut"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "seul SHA-1 est pris en charge pour les réponses\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "erreur d'allocation d'élément de liste : %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  "aucun certificat convenable n'a été trouvée pour vérifier la réponse OCSP\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "certificat d'émetteur introuvable : %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "l'appelant n'a pas renvoyé le certificat cible\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "l'appelant n'a pas renvoyé le certificat émetteur\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "échec d'allocation du contexte OCSP : %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "aucun répondeur OCSP par défaut défini\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "aucun signataire OCSP par défaut défini\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "utilisation du répondeur OCSP « %s » par défaut\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "utilisation du répondeur OCSP « %s »\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "échec d'établissement d'un contexte de hachage pour OCSP : %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "erreur de lecture de l'état OCSP pour le certificat cible : %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "l'état du certificat est : %s  (celui-ci=%s  prochain=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "correct"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "le certificat a été révoquée le : %s à cause de : %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "le répondeur OCSP a renvoyé un état dans le futur\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "le répondeur OCSP a renvoyé un état non actuel\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "échec d'assuan_inquire(%s) : %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "ldapserver manquant"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "serialno manquant dans l'identifiant de certificat"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "échec d'assuan_inquire : %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "échec de fetch_cert_by_url : %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "échec de start_cert_fetch : %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "échec de fetch_next_cert : %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d dépassé\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossible d'allouer une structure de contrôle : %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "échec d'allocation du contexte Assuan : %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "impossible d'initialiser le serveur : %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problème d'accept_assuan : %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "problème de traitement Assuan : %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  "acceptation de l'autorité de certification racine non marquée comme une "
  "autorité de certification"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr ""
  "vérification de liste de révocations de certificat imbriquée trop "
  "profondément\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "pas de vérification de liste de révocations de certificat pour"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "vérification de liste de révocations de certificat pour"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "certificat autosigné avec une mauvaise signature"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr ""
  "échec de vérification du niveau de confiance du certificat racine : %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "la chaîne de certificats est correcte\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  "le certificat n'aurait pas dû être utilisé pour signer une liste de "
@@@ -10709,203 -8550,156 +10737,203 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  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:723
- #: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Options contrôlant la sécurité"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|oublier les clefs SSH après N secondes"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Options d'application d'une politique de phrase secrète"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "pas de contournement de politique de phrase secrète"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  "|N|nécessiter au moins N caractères non alphabétiques pour les nouvelles "
  "phrases secrètes"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  "|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
  "FICHIER"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|la phrase secrète expire après N jours"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set LDAP timeout to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOM|chiffrer aussi pour l'identité NOM"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|configurer les alias d'adresse"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Configuration pour les serveurs de clefs"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|utiliser le serveur de clefs à l'URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "permettre les recherches PKA (requêtes DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "désactiver tous les accès au dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  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:829
++#: tools/gpgconf-comp.c:836
  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:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Options contrôlant le format de sortie"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Options contrôlant l'interactivité et la mise en application"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Options contrôlant la sécurité"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Configuration pour les serveurs HTTP"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Configuration des serveurs LDAP à utiliser"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "liste de serveurs LDAP"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Configuration pour OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG pour OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Démon de carte à puce"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG pour S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erreur de réseau"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Entrée de code personnel et de phrase secrète"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Composant non convenable pour le lancement"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Échec de vérification externe du composant %s"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error hashing '%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/gl.po
index 2b821af,cacffc3..86ff4bb
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -15,7 -14,6 +15,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@@ -26,41 -24,32 +26,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -68,7 -57,6 +68,7 @@@ msgstr "contrasinal incorrecto
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -78,75 -66,59 +78,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "contrasinal erróneo"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "liña longa de máis\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "contrasinal demasiado longo\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Caracter non válido no nome\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI erróneo"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "contrasinal erróneo"
@@@ -156,151 -127,116 +156,158 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "non se puido abrir `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "erro ao crea-lo contrasinal: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  #, fuzzy
  msgid "Admin PIN"
  msgstr "Introduza o ID de usuario: "
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Repita o contrasinal: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Repita o contrasinal: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Repita o contrasinal: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -385,48 -307,33 +392,48 @@@ msgstr "
  "Opcións:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A chave é obsoleta"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -511,11 -401,6 +518,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
@@@ -533,47 -416,34 +540,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "non foi posible crear %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Revocación de certificado válida"
@@@ -583,28 -452,22 +590,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "gravando a chave secreta en `%s'\n"
@@@ -632,7 -489,6 +639,7 @@@ msgstr "base de datos de confianza: fal
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: non foi posible crear un directorio: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -657,12 -509,10 +664,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "o segredo da actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu chaves omitidas\n"
@@@ -684,8 -530,6 +691,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -537,6 +700,9 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -749,8 -582,6 +756,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -809,8 -631,6 +816,8 @@@ msgstr "
  msgid "Yes"
  msgstr "si|sim"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -861,19 -674,16 +868,19 @@@ msgstr "cambia-lo contrasinal
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "habilitar unha chave"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -893,7 -700,6 +900,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
@@@ -920,22 -722,14 +927,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -950,8 -742,6 +957,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "erro lendo `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -961,12 -750,10 +968,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@@ -1195,8 -936,6 +1202,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1334,7 -1046,10 +1341,12 @@@ msgstr "error nunha liña adicional\n
  msgid "[none]"
  msgstr "descoñecido"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "carácter radix64 non válido %02x omitido\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "gravando a chave secreta en `%s'\n"
@@@ -1410,7 -1111,6 +1422,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "non procesado"
@@@ -1469,8 -1158,6 +1481,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1639,8 -1293,6 +1651,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1301,10 +1662,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "¿A súa selección? "
  
@@@ -1725,17 -1357,11 +1737,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -1802,7 -1415,6 +1814,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@@ -1833,13 -1440,10 +1845,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeado a %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1894,9 -1488,6 +1906,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Selección non válida.\n"
  
@@@ -2031,23 -1593,15 +2043,23 @@@ msgstr "Comando incorrecto (tente \"hel
  msgid "--output doesn't work for this command\n"
  msgstr "--output non traballa con este comando\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1652,6 +2122,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -2149,7 -1684,6 +2161,7 @@@ msgid "
  msgstr ""
  "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2280,40 -1790,31 +2292,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "escribindo a `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: non se exportou nada\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2595,7 -2035,6 +2607,7 @@@ msgstr "|N|axusta-lo nivel de compresi�
  msgid "use canonical text mode"
  msgstr "usar modo de texto canónico"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
@@@ -2776,473 -2187,375 +2788,477 @@@ msgstr "AVISO: permisos do directorio c
  msgid "unknown configuration item '%s'\n"
  msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "amosar en que chaveiro está unha chave listada"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, 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:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opcións de importación non válidas\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, 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:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, 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:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "non se puido estabrecer exec-path a %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, 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:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s fai que se ignore %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "¡%s non se admite con %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "¡%s non ten sentido empregándoo con %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser superior a 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser superior a 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  #, 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:3737
++#: g10/gpg.c:3741
  #, 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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferencias por defecto non válidas\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferencias de cifrado personais non válidas\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferencias de resumo personais non válidas\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferencias de compresión personais non válidas\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "¡%s aínda non traballa con %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, 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:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "o descifrado fallou: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "a recepción do servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "a exportación da chave fallou: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "a busca no servidor de chaves fallou fallou: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "a actualización no servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "non se puido quita-la armadura: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Escriba a súa mensaxe ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  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:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "toma-las chaves deste chaveiro"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "converte-los conflictos de selo de data nun aviso"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|DF|escribi-la información de estado a este DF"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpgv [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4606,15 -3654,10 +4622,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada] "
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4656,7 -3693,6 +4672,7 @@@ msgstr "
  "Non pode engadir unha identificación fotográfica a unha chave de estilo "
  "PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4688,7 -3718,6 +4704,7 @@@ msgstr[1] "Borrada %d sinatura.\n
  msgid "Nothing deleted.\n"
  msgstr "Non se borrou nada.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "armadura non válida"
@@@ -4938,74 -3919,58 +4954,74 @@@ msgid "Displaying %s photo ID of size %
  msgstr ""
  "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia %c%lu duplicada\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "caracter non válido na cadea de preferencias\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "escribindo unha sinatura directa\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "escribindo a propia sinatura\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "escribindo unha sinatura que liga a chave\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamaño de chave non válido; empregando %u bits\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamaño de chave redondeado a %u bits\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar datos"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5019,157 -3984,126 +5035,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (só asinar)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notación de sinaturas: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "O tamaño de chave requerido son %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5185,7 -4119,6 +5201,7 @@@ msgstr "
  "      <n>m = a chave caduca en n meses\n"
  "      <n>y = a chave caduca en n anos\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5201,40 -4134,32 +5217,40 @@@ msgstr "
  "      <n>m = a sinatura caduca en n meses\n"
  "      <n>y = a sinatura caduca en n anos\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "¿Por canto tempo é válida a chave? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "¿Por canto tempo é válida a sinatura? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valor non válido\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca o %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "A sinatura caduca o %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5242,12 -4167,10 +5258,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "¿Isto é correcto? (s/n) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5258,7 -4181,6 +5274,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5275,50 -4197,39 +5291,50 @@@ msgstr "
  "     \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nome: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Caracter non válido no nome\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "O nome non pode comezar cun díxito\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome debe ter alomenos 5 caracteres\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Enderezo de E-mail: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Non é un enderezo de e-mail válido\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Carácter non válido no comentario\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5329,7 -4240,6 +5345,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
@@@ -5345,35 -4255,28 +5361,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeAaSs"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Por favor, corrixa antes o erro\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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 -4288,10 +5401,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5399,68 -4299,55 +5415,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' xa está comprimido\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Cancelouse a xeración de chaves.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5470,7 -4357,6 +5486,7 @@@ msgstr "
  "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
  "con esa finalidade.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5478,7 -4364,6 +5494,7 @@@ msgstr "
  "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5486,22 -4371,18 +5502,22 @@@ msgstr "
  "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "¿Crear realmente? "
@@@ -5584,19 -4449,16 +5600,19 @@@ msgstr "     Pegada dactilar =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "comprobando o chaveiro `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu chaves comprobadas (%lu sinaturas)\n"
  msgstr[1] "%lu chaves comprobadas (%lu sinaturas)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "\t%lu keys updated\n"
  msgid "%lu key cached"
@@@ -5604,7 -4466,6 +5620,7 @@@ msgid_plural "%lu keys cached
  msgstr[0] "\t%lu chaves actualizadas\n"
  msgstr[1] "\t%lu chaves actualizadas\n"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5612,7 -4473,6 +5628,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 sinatura errónea\n"
  msgstr[1] "1 sinatura errónea\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: chaveiro creado\n"
@@@ -5914,7 -4712,6 +5930,7 @@@ msgstr "binario
  msgid "textmode"
  msgstr "modo texto"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "descoñecido"
  
@@@ -6134,55 -4889,44 +6150,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Introduza o contrasinal\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "cancelado polo usuario\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (ID principal da chave %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6621,17 -5282,14 +6637,17 @@@ msgstr "a codificación vella do DEK no
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "o algoritmo de cifrado %d%s é descoñecido ou está desactivado\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6927,18 -5536,15 +6943,18 @@@ msgstr "AVISO: non se pode expandir-%% 
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "Sinatura %s de: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "asinando:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "hase empregar cifrado %s\n"
@@@ -7003,17 -5598,14 +7019,17 @@@ msgstr "erro: pegada dactilar non váli
  msgid "ownertrust value missing"
  msgstr "importa-los valores de confianza no propietario"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "erro ao buscar un rexistro de confianza: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de datos de confianza: fallou a sincronización: %s\n"
@@@ -7048,7 -5634,6 +7064,7 @@@ msgstr "transacción da base de datos d
  msgid "%s: directory does not exist!\n"
  msgstr "%s: ¡o directorio non existe!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "non se pode pechar `%s': %s\n"
@@@ -7191,10 -5748,6 +7207,10 @@@ msgstr "erro ao crea-lo contrasinal: %s
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
@@@ -7226,7 -5774,6 +7242,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
@@@ -7398,11 -5918,9 +7414,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7411,121 -5928,101 +7427,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Borradas %d sinaturas.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "cifrado con %lu contrasinais\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Normativa: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7542,18 -6039,14 +7558,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7604,56 -6088,45 +7620,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "non se precisa comproba-la base de datos de confianza\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, 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:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "por favor, execute con --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "comprobando a base de datos de confianza\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7661,22 -6134,18 +7677,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "non se atoparon chaves de confianza absoluta\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7791,19 -6239,14 +7807,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7852,7 -6286,6 +7868,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -7867,69 -6298,67 +7883,84 @@@ msgstr "non se puido inicializa-la bas
  msgid "failed to store the creation date: %s\n"
  msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, 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:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7938,27 -6367,22 +7969,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "cambia-lo contrasinal"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "cambia-lo contrasinal"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7966,117 -6390,93 +7997,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' xa está comprimido\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non soportado"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "non se atoparon datos OpenPGP válidos.\n"
@@@ -8098,57 -6495,45 +8129,57 @@@ msgstr "Introduza o ID de usuario: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "non usa-la terminal en absoluto"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "comandos conflictivos\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8158,22 -6542,14 +8189,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "carácter radix64 non válido %02x omitido\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@@ -8192,12 -6565,10 +8218,12 @@@ msgstr "
  msgid "shell"
  msgstr "axuda"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8210,12 -6579,10 +8236,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "non se puido abrir `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "gravando a chave secreta en `%s'\n"
@@@ -8243,9 -6605,6 +8269,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8268,12 -6623,10 +8294,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  #, fuzzy
  msgid "certificate not yet valid"
  msgstr "Revocación de certificado válida"
@@@ -8288,7 -6639,6 +8314,7 @@@ msgstr "Revocación de certificado vál
  msgid "intermediate certificate not yet valid"
  msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "problema de lectura do certificado: %s\n"
@@@ -8344,7 -6683,6 +8370,7 @@@ msgstr "Revocación de certificado vál
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Pegada dactilar:"
@@@ -8377,7 -6709,6 +8403,7 @@@ msgstr "Certificado correcto
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
@@@ -8389,31 -6719,25 +8415,31 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  #, fuzzy
  msgid "certificate chain too long\n"
  msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  #, fuzzy
  msgid "issuer certificate not found"
  msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verificar unha sinatura"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "Revocación de certificado válida"
@@@ -8444,11 -6763,9 +8470,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "non|nom"
@@@ -8484,36 -6796,28 +8510,36 @@@ msgstr "
  "\"%.*s\"\n"
  "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8607,72 -6893,58 +8633,72 @@@ msgstr "erro ao crea-lo chaveiro `%s': 
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "A xeración da chave fallou: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (só asinar)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "deshabilitar unha chave"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (asinar e cifrar)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (só asinar)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (só cifrar)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Non se deu unha descrición)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritmo de hash non válido `%s'\n"
@@@ -8682,82 -6954,65 +8708,82 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "algoritmo de hash non válido `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Enderezo de E-mail: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Introduza o ID de usuario. Remate cunha liña en branco: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Introduza o novo nome de ficheiro"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  #, fuzzy
  msgid "Enter URIs"
  msgstr "Introduza o ID de usuario: "
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Creouse o certificado de revocación.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8899,7 -7123,6 +8925,7 @@@ msgstr "engadir este chaveiro á lista 
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
@@@ -8987,17 -7194,14 +9013,17 @@@ msgstr "Certificado correcto
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -9061,7 -7254,6 +9087,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9075,168 -7266,138 +9101,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "o algoritmo de protección %d%s non está soportado\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "A sinatura caducou o %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Sinatura correcta de \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "               alias \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Esta ha ser unha auto-sinatura.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "certificado duplicado - borrado"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "certificado duplicado - borrado"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "certificado duplicado - borrado"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Pegada dactilar:"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "Certificado non válido"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "erro ao crea-lo contrasinal: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Creouse o certificado de revocación.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "Revocación de certificado válida"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "erro: pegada dactilar non válida\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "Certificado correcto"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -9273,7 -7428,6 +9304,7 @@@ msgstr "fallou o borrado do bloque de c
  msgid "not removing file '%s'\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -9498,7 -7608,6 +9529,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9515,13 -7622,11 +9546,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "resposta do axente non válida\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "o cambio de permisos de `%s' fallou: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9572,149 -7668,120 +9603,149 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verificación de sinatura suprimida\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "lid ?: a inserción fallou: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "escribindo a `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? problema ao comproba-la revocación: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "a actualización fallou: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "lid ?: a inserción fallou: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -9723,50 -7789,38 +9754,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "erro ao crear `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "non se atopou a chave `%s': %s\n"
@@@ -9921,116 -7946,88 +9952,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "¿Saír sin gardar? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10043,91 -8040,72 +10074,91 @@@ msgstr "
  "@\n"
  "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opcións] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non procesado"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10367,38 -8297,31 +10398,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "buscando \"%s\" no servidor HKP %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versión do ficheiro incorrecta %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "non se puido abrir un ficheiro: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "o segredo da actualización fallou: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10431,255 -8348,199 +10462,251 @@@ msgstr "erro lendo `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "o cambio de permisos de `%s' fallou: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "Revocación de certificado válida"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "Certificado correcto"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: non é posible acceder: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "non hai un chaveiro privado por defecto: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "NOTA: a chave está revocada"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "comprobando a base de datos de confianza\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verificar unha sinatura"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "Revocación de certificado válida"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10776,194 -8616,147 +10803,194 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  #, 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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|emprega-lo modo de contrasinal N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifrar para NOME"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, 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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erro de rede"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "contrasinal erróneo"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "non se atopou a chave pública"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "erro lendo `%s': %s\n"
diff --cc po/gnupg2.pot
index 2315406,df869c9..dcc1748
--- 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.18\n"
 -"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.19\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+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: 2017-03-01 16:34+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
++#: agent/call-pinentry.c:296
  #, 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
@@@ -29,47 -30,47 +29,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
 -msgstr "|pinentry-label|取消 (_C)"
 +msgstr ""
  
- #: agent/call-pinentry.c:464
 -#, fuzzy
 -#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:465
 -#, fuzzy
 -#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
 -msgstr "|pinentry-label|個人識別碼 (PIN):"
 +msgstr ""
  
- #: agent/call-pinentry.c:467
 -#, fuzzy
 -#| msgid "|pinentry-label|_Cancel"
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
 -msgstr "|pinentry-label|取消 (_C)"
 +msgstr ""
  
- #: agent/call-pinentry.c:468
 -#, fuzzy
 -#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 +msgstr ""
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
 -#, fuzzy
 -#| msgid "Enter new passphrase"
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
 -msgstr "請輸入新密語"
 +msgstr ""
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
 -msgstr "優劣程度: %s"
 +msgstr ""
  
  #. TRANSLATORS: This string is a tooltip, shown by pinentry when
  #. hovering over the quality bar.  Please use an appropriate
@@@ -77,230 -78,179 +77,237 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
 -"上列輸入文字的優劣程度.\n"
 -"關於此規範的細節, 請洽你的系統管理者."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
 -msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
 +msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
 -msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 +msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
 -msgstr "密語:"
 +msgstr ""
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
 -msgstr "前後不一致 - 請再試一次"
 +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
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
 -msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
 +msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
 -msgstr "重複:"
 +msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
 -msgstr "個人識別碼 (PIN) 太長"
 +msgstr ""
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
 -msgstr "密語太長"
 +msgstr ""
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
 -msgstr "個人識別碼 (PIN) 含有無效的字符"
 +msgstr ""
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
 -msgstr "個人識別碼 (PIN) 太短"
 +msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
 -msgstr "不良的個人識別碼 (PIN)"
 +msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
 -msgstr "無法開啟 '%s': %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
 -msgstr "取得此卡片序號時出錯: %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
 -msgstr "偵測到卡片, 其序號為: %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
 -msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
 -msgstr "找不到合適的卡片金鑰: %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2709
 -#, fuzzy, c-format
 -#| msgid "error getting stored flags: %s\n"
++#: agent/command-ssh.c:2602
++#, c-format
+ msgid "error getting list of cards: %s\n"
 -msgstr "取得已存放的旗標時出錯: %s\n"
++msgstr ""
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
 -"有某個 ssh 程序提出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請問是否允許?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
 -msgstr "允許"
 +msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
 -msgstr "拒絕"
 +msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 -msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
 +msgstr ""
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
 -msgstr "請再次輸入密語"
 +msgstr ""
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  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
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
 -msgstr "從 socket 建立串流失敗: %s\n"
 +msgstr ""
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
 -msgstr "請插入下列序號的卡片:"
 +msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
 -msgstr "請移除現用中的卡片並插入下列序號的卡片:"
 +msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
 -msgstr "管理者個人識別碼 (PIN)"
 +msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
 -msgstr "PIN 重設碼 (PUK)"
 +msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
 -msgstr "重設碼"
 +msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
 -msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
 +msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
 -msgstr "請再次輸入重設碼"
 +msgstr ""
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
 -msgstr "請再次輸入 PUK"
 +msgstr ""
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
 -msgstr "請再次輸入個人識別碼 (PIN)"
 +msgstr ""
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
 -msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
 +msgstr ""
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
 -msgstr "前後兩次輸入的 PUK 不一致; 請再試一次"
 +msgstr ""
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
 -msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 +msgstr ""
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
 -msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
 +msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
 -msgstr "建立暫存檔時出錯: %s\n"
 +msgstr ""
  
 +#: agent/genkey.c:117
  #, c-format
  msgid "error writing to temporary file: %s\n"
 -msgstr "寫入暫存檔時出錯: %s\n"
 +msgstr ""
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  msgid "Enter new passphrase"
 -msgstr "請輸入新密語"
 +msgstr ""
  
 +#: agent/genkey.c:172
  msgid "Take this one anyway"
 -msgstr "無論如何還是要用這個"
 +msgstr ""
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -356,102 -297,81 +363,102 @@@ msgid "
  "@Options:\n"
  " "
  msgstr ""
 -"@選項:\n"
 -" "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
 -msgstr "以服務模式執行 (背景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
 -msgstr "以伺服器模式執行 (前景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
 -#, fuzzy
 -#| msgid "run in server mode"
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  msgid "run in supervised mode"
 -msgstr "以伺服器模式執行"
 +msgstr ""
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
 -msgstr "盡量安靜些"
 +msgstr ""
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
 -msgstr "sh 樣式的指令輸出"
 +msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
 -msgstr "csh 樣式的指令輸出"
 +msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
 -msgstr "|檔案|從指定檔案中讀取選項"
 +msgstr ""
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  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 -387,134 +477,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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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:492
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 -msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
 +msgstr ""
  
 +#: agent/gpg-agent.c:494
  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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
 -msgstr "給定的除錯等級 '%s' 無效\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
 -msgstr "請注意: 沒有預設選項檔 '%s'\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
 -msgstr "選項檔 '%s': %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
 -msgstr "從 '%s' 讀取選項中\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
 -msgstr "請注意: '%s' 並不當成選項\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
 -msgstr "無法建立 socket: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
 -msgstr "socket 名稱 '%s' 太長\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2147
  msgid "a gpg-agent is already running - not starting a new one\n"
 -msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
 -msgstr "為 socket 取得 nonce 時出錯\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
 -msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
 -#, fuzzy, c-format
 -#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
 +#, c-format
  msgid "can't set permissions of '%s': %s\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
 -msgstr "listen() 失敗: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
 -msgstr "正在候聽 socket '%s'\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2203 agent/gpg-agent.c:2246 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:2206 agent/gpg-agent.c:2251 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:2257
  #, c-format
  msgid "stat() failed for '%s': %s\n"
 -msgstr "'%s' 的 stat() 失敗: %s\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2261
  #, c-format
  msgid "can't use '%s' as home directory\n"
 -msgstr "無法使用 '%s' 做為家目錄\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
 -msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2611
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2616
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2691
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:2696
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
 -msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
 -msgstr "%s %s 已停止\n"
 +msgstr ""
  
 +#: agent/gpg-agent.c:3104 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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
 -"@指令:\n"
 -" "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -675,55 -549,46 +682,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: 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
@@@ -738,16 -602,13 +745,16 @@@
  msgid ""
  "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
  "certificates?"
 -msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 +msgstr ""
  
 +#: agent/trustlist.c:673 common/audit.c:467
  msgid "Yes"
 -msgstr "Yes"
 +msgstr ""
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
 -msgstr "No"
 +msgstr ""
  
  #. TRANSLATORS: This prompt is shown by the Pinentry and has
  #. one special property: A "%%0A" is used by Pinentry to
@@@ -785,227 -641,181 +792,227 @@@ msgstr "
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
 -msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
 +msgstr ""
  
 +#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
 +#: agent/findkey.c:299
  msgid "I'll change it later"
 -msgstr "我稍後再變更"
 +msgstr ""
  
- #: agent/findkey.c:1438
 -#, fuzzy, c-format
 -#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: agent/findkey.c:1460
 +#, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
 -msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 +msgstr ""
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
 -msgstr "刪除金鑰"
 +msgstr ""
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  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
++#: agent/pksign.c:517
  #, 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: 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:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, 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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, 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:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 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 ""
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
 -#, fuzzy, c-format
 -#| msgid "waiting for process %d to terminate failed: %s\n"
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
 +#, c-format
  msgid "waiting for processes to terminate failed: %s\n"
 -msgstr "等候 %d 處理程序終止時失敗: %s\n"
 +msgstr ""
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 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:148
  #, c-format
  msgid "can't disable core dumps: %s\n"
 -msgstr "無法讓系統停止傾印核心檔: %s\n"
 +msgstr ""
  
 +#: common/sysutils.c:250
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
 -msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 +msgstr ""
  
 +#: common/sysutils.c:282
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
 -#, 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: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:556
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
@@@ -1044,405 -849,316 +1051,410 @@@ 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:3102
++#: scd/app-openpgp.c:3257
  #, 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/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
 -msgstr "已跳過無效的 radix64 字符 %02x\n"
++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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, 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: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: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:1306
  msgid "no valid OpenPGP data found.\n"
 -msgstr "找不到有效的 OpenPGP 資料.\n"
 +msgstr ""
  
 +#: g10/armor.c:1311
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
 -msgstr "無效的封裝: 列長超出 %d 字符\n"
 +msgstr ""
  
 +#: 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,284 -1204,225 +1503,284 @@@ 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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 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:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: 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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, 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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, 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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 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 ""
  
@@@ -1840,138 -1477,105 +1852,138 @@@ msgstr "
  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:2817
  msgid "Invalid command  (try \"help\")\n"
 -msgstr "無效的指令  (試試看 \"help\")\n"
 +msgstr ""
  
 +#: g10/decrypt.c:190 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
 -msgstr "--output 在這個指令中沒有作用\n"
 +msgstr ""
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, 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: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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2087,51 -1667,39 +2099,51 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
 -msgstr " - 已跳過"
 +msgstr ""
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
 -msgstr "正在寫入 '%s'\n"
 +msgstr ""
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
 -msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 +msgstr ""
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
 -msgstr "不允許匯出私鑰\n"
 +msgstr ""
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
 -msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 +msgstr ""
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
 -msgstr "警告: 沒有匯出任何東西\n"
 +msgstr ""
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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 ""
@@@ -2351,43 -1877,33 +2363,43 @@@ msgstr "
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
 +#: g10/gpg.c:534 sm/gpgsm.c:248
  msgid "create ascii armored output"
 -msgstr "建立以 ASCII 封裝過的輸出"
 +msgstr ""
  
 +#: g10/gpg.c:537 sm/gpgsm.c:264
  msgid "|USER-ID|encrypt for USER-ID"
 -msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
 +msgstr ""
  
 +#: 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:559
  msgid "|N|set compress level to N (0 disables)"
 -msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 +msgstr ""
  
 +#: g10/gpg.c:566
  msgid "use canonical text mode"
 -msgstr "使用標準的文字模式"
 +msgstr ""
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
 -msgstr "|檔案|將輸出寫入至指定檔案"
 +msgstr ""
  
 +#: 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:599
  msgid "prompt before overwriting"
 -msgstr "覆寫前先詢問"
 +msgstr ""
  
 +#: g10/gpg.c:648
  msgid "use strict OpenPGP behavior"
 -msgstr "使用嚴謹的 OpenPGP 行為"
 +msgstr ""
  
 +#: g10/gpg.c:674 sm/gpgsm.c:357
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2507,459 -2026,366 +2519,463 @@@ msgstr "
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
 +#: g10/gpg.c:1600
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
 +#: g10/gpg.c:1816
  #, c-format
  msgid "unknown configuration item '%s'\n"
 -msgstr "未知的組態項目 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
 -msgstr "列出金鑰時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
 -msgstr "列出金鑰時顯示金鑰用途資訊"
 +msgstr ""
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
 -msgstr "列出簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
 -msgstr "列出簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
 -msgstr "列出簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
 -msgstr "列出簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
 -msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
 -msgstr "列出金鑰時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 +msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
 -msgstr "在金鑰清單中顯示鑰匙圈名稱"
 +msgstr ""
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
 -msgstr "列出簽章時顯示有效期限"
 +msgstr ""
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2053 g10/gpg.c:2090
 +#, c-format
  msgid "valid values for option '%s':\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
- #: g10/gpg.c:2062
 -#, fuzzy, c-format
 -#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2064
 +#, c-format
  msgid "unknown TOFU policy '%s'\n"
 -msgstr "未知的選項 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2100 g10/keygen.c:168
 +#, c-format
  msgid "invalid value for option '%s'\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
 -msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
 -msgstr "請注意: 一般情況下不採用 %s!\n"
 +msgstr ""
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
 -msgstr "'%s' 不是有效的簽章使用期限\n"
 +msgstr ""
  
- #: g10/gpg.c:3045
 -#, fuzzy, c-format
 -#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3047
 +#, c-format
  msgid "\"%s\" is not a proper mail address\n"
 -msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
 -msgstr "無效的個人識別碼項目模式 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
 -msgstr "'%s' 不是有效的字元集\n"
 +msgstr ""
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
 -msgstr "無法剖析金鑰伺服器 URL\n"
 +msgstr ""
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
 -msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
 -msgstr "無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
 -msgstr "%s:%d: 無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
 -msgstr "無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
 -#, fuzzy, c-format
 -#| msgid "invalid list options\n"
++#: g10/gpg.c:3193 g10/gpg.c:3208
 +#, c-format
  msgid "invalid filter option: %s\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
 -msgstr "%s:%d: 無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
 -msgstr "無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
 -msgstr "%s:%d: 無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
 -msgstr "驗證簽章時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
 -msgstr "驗證簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
 -msgstr "驗證簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
 -msgstr "驗證簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
 -msgstr "驗證簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
 -msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
 -msgstr "驗證簽章時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
 -msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
 -msgstr "驗證簽章時祇顯示主要的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
 -msgstr "以 PKA 資料驗證簽章"
 +msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
 -msgstr "提高對持有有效 PKA 資料之簽章的信任"
 +msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
 -msgstr "%s:%d: 無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
 -msgstr "無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
 -msgstr "無法把執行檔路徑設成 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
 -msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
 -msgstr "無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
 -msgstr "警告: 程式可能會傾印出核心檔!\n"
 +msgstr ""
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
 -msgstr "警告: %s 會推翻 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
 -msgstr "%s 不允許跟 %s 併用!\n"
 +msgstr ""
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
 -msgstr "%s 跟 %s 放在一起沒有意義!\n"
 +msgstr ""
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
 -msgstr "警告: 正在偽造的系統時間中執行: "
 +msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
 -msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 +msgstr ""
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
 -msgstr "所選的編密演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
 -msgstr "所選的摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
 -msgstr "所選的壓縮演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
 -msgstr "所選的憑證摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
 -msgstr "completes-needed 一定要大於 0\n"
 +msgstr ""
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
 -msgstr "marginals-needed 一定要大於 1\n"
 +msgstr ""
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 -msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 -msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
 +msgstr ""
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
 -msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
 -msgstr "無效的預設偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
 -msgstr "無效的個人編密法偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
 -msgstr "無效的個人摘要偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
 -msgstr "無效的個人壓縮偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
 -msgstr "%s 還沒辦法跟 %s 一起運作\n"
 +msgstr ""
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
 -msgstr "信任資料庫啟始失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
 -msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 +msgstr ""
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
 -msgstr "'%s' 對稱式加密失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
 -msgstr "送至金鑰伺服器失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
 -msgstr "從金鑰伺服器接收失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4496
 -#, fuzzy, c-format
 -#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4500
 +#, c-format
  msgid "export as ssh key failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
 -msgstr "用金鑰伺服器搜尋失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
 -msgstr "從金鑰伺服器更新失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
 -msgstr "解開封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
 -msgstr "進行封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
 -msgstr "無效的雜湊演算法 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
 -#, fuzzy, c-format
 -#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4841 g10/tofu.c:2151
 +#, c-format
  msgid "error parsing key specification '%s': %s\n"
 -msgstr "載入憑證 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
 -msgstr "請開始輸入你的訊息 ...\n"
 +msgstr ""
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
 -msgstr "給定的的憑證原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
 -msgstr "給定的簽章原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
 -msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 +msgstr ""
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
 -msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
 +msgstr ""
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
 -msgstr "僅把時間戳印矛盾視為警告"
 +msgstr ""
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
 -msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 +msgstr ""
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
 -msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4192,19 -3399,15 +4208,19 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
 -msgstr "已撤銷"
 +msgstr ""
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
 -msgstr "已過期"
 +msgstr ""
  
 +#: 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"
@@@ -4224,73 -3426,60 +4240,73 @@@ msgid "
  "versions\n"
  "         of PGP to reject this key.\n"
  msgstr ""
 -"警告: 這是一把 PGP2 型態的金鑰.\n"
 -"      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
 +#: 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:4392
  msgid "You may not add a photo ID to a PGP2-style key.\n"
 -msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
 -msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 +msgstr ""
  
 +#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
 -msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 +msgstr ""
  
 +#: g10/keyedit.c:4519
  msgid "Delete this invalid signature? (y/N/q)"
 -msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 +msgstr ""
  
 +#: g10/keyedit.c:4523
  msgid "Delete this unknown signature? (y/N/q)"
 -msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 +msgstr ""
  
 +#: g10/keyedit.c:4530
  msgid "Really delete this self-signature? (y/N)"
 -msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 +msgstr ""
  
 -#, 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:4550
  msgid "Nothing deleted.\n"
 -msgstr "沒有刪除任何東西.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
 -msgstr "無效"
 +msgstr ""
  
 +#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
 -msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 +msgstr ""
  
 -#, 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:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
 -msgstr "使用者 ID \"%s\": 已經最小化了\n"
 +msgstr ""
  
 +#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
 -msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 +msgstr ""
  
 +#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4465,96 -3625,75 +4481,96 @@@ msgstr "
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
 +#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
 -msgstr "使用者 ID \"%s\" 已撤銷\n"
 +msgstr ""
  
 +#: 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:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
 -msgstr "金鑰 %s 已撤銷.\n"
 +msgstr ""
  
 +#: g10/keyedit.c:6547
  #, c-format
  msgid "Subkey %s is already revoked.\n"
 -msgstr "子鑰 %s 已撤銷.\n"
 +msgstr ""
  
 +#: 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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
 -msgstr "偏好設定 '%s' 重複了\n"
 +msgstr ""
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
 -msgstr "編密偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
 -msgstr "摘要偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
 -msgstr "壓縮偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
 -msgstr "偏好字串中含有無效的項目 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
 -msgstr "寫入直接簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
 -msgstr "寫入自我簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
 -msgstr "寫入附鑰簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
 -msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
 -msgstr "金鑰尺寸增大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 -msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
 -msgstr "簽署"
 +msgstr ""
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
 -msgstr "保證"
 +msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
 -msgstr "加密"
 +msgstr ""
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
 -msgstr "鑑定"
 +msgstr ""
  
  #. TRANSLATORS: Please use only plain ASCII characters for the
  #. translation.  If this is not possible use single digits.  The
@@@ -4566,150 -3705,119 +4582,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
 -msgstr "SsEeAaQq"
 +msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
 -msgstr "%s 金鑰可能的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
 -msgstr "目前可進行的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
 -msgstr "   (%c) 切換簽署性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
 -msgstr "   (%c) 切換加密性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
 -msgstr "   (%c) 切換鑑定性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
 -msgstr "   (%c) 已完成\n"
 +msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
 -msgstr "請選擇你要使用的金鑰種類:\n"
 +msgstr ""
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
 -msgstr "   (%d) RSA 和 RSA (預設)\n"
 +msgstr ""
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
 -msgstr "   (%d) DSA 和 Elgamal\n"
 +msgstr ""
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
 -msgstr "   (%d) DSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
 -msgstr "   (%d) RSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
 -msgstr "   (%d) Elgamal (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
 -msgstr "   (%d) RSA (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
 -msgstr "   (%d) DSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
 -msgstr "   (%d) RSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
 -msgstr "   (%d) ECC 和 ECC\n"
 +msgstr ""
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
 -msgstr "   (%d) ECC (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
 -msgstr "   (%d) ECC (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
 -msgstr "   (%d) ECC (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
 -msgstr "   (%d) 現有的金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
 -msgstr "請輸入金鑰鑰柄: "
 +msgstr ""
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 -msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 +msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
 -msgstr "沒有金鑰有此金鑰鑰柄\n"
 +msgstr ""
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
 -msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 +msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
 -msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
 -msgstr "你想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
 -msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
 -msgstr "請選擇你要使用的橢圓曲線:\n"
 +msgstr ""
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4718,8 -3826,13 +4734,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4728,49 -3841,47 +4744,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
 -msgstr "金鑰的有效期限是多久? (0) "
 +msgstr ""
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
 -msgstr "簽章的有效期限是多久? (%s) "
 +msgstr ""
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
 -msgstr "無效的數值\n"
 +msgstr ""
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
 -msgstr "金鑰完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
 -msgstr "簽章完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
 -msgstr "金鑰將會在 %s 到期\n"
 +msgstr ""
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
 -msgstr "簽章將會在 %s 到期.\n"
 +msgstr ""
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
 -msgstr "以上正確嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4781,7 -3895,6 +4797,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4790,60 -3903,56 +4806,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:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
 -msgstr "真實姓名: "
 +msgstr ""
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
 -msgstr "姓名含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
 -msgstr "姓名不可以用數字開頭\n"
 +msgstr ""
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
 -msgstr "姓名至少要有五個字符長\n"
 +msgstr ""
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
 -msgstr "電子郵件地址: "
 +msgstr ""
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
 -msgstr "不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
 -msgstr "註釋: "
 +msgstr ""
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
 -msgstr "註釋含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
 -msgstr "你正在使用 '%s' 字元集.\n"
 +msgstr ""
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"你選擇了這個使用者 ID:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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
@@@ -4856,248 -3965,206 +4872,248 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
 -msgstr "NnCcEeOoQq"
 +msgstr ""
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
 -msgstr "請先訂正錯誤\n"
 +msgstr ""
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
 -msgstr "產生金鑰失敗: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"即將建立用於此之金鑰:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
 -msgstr "是否繼續? (Y/n) "
 +msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
 -msgstr "\"%s\" 的金鑰已存在\n"
 +msgstr ""
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
 -msgstr "無論如何還是要建立嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
 -msgstr "總之還是在建立\n"
 +msgstr ""
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 -msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
 +msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
 -msgstr "金鑰產生已取消.\n"
 +msgstr ""
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
 -msgstr "無法建立備份檔案 '%s': %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
 -msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
 -msgstr "正在寫入公鑰至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
 -msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
 -msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
 -msgstr "公鑰和私鑰已建立及簽署.\n"
 +msgstr ""
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 -msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
 +msgstr ""
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
 -msgstr "主鑰的私鑰部分無法取用.\n"
 +msgstr ""
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
 -msgstr "主鑰的私鑰部分存放於卡上.\n"
 +msgstr ""
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  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:330
  msgid "Critical signature policy: "
 -msgstr "關鍵簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:332
  msgid "Signature policy: "
 -msgstr "簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:372
  msgid "Critical preferred keyserver: "
 -msgstr "執意偏好的金鑰伺服器: "
 +msgstr ""
  
 +#: g10/keylist.c:425
  msgid "Critical signature notation: "
 -msgstr "關鍵簽章註記: "
 +msgstr ""
  
 +#: g10/keylist.c:427
  msgid "Signature notation: "
 -msgstr "簽章註記: "
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%d bad signatures\n"
 +#: g10/keylist.c:469
 +#, 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:482
 +#, 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:564
 +#, 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:586
  msgid "Keyring"
 -msgstr "鑰匙圈"
 +msgstr ""
  
 +#: g10/keylist.c:1716
  msgid "Primary key fingerprint:"
 -msgstr "               主鑰指紋:"
 +msgstr ""
  
 +#: g10/keylist.c:1718
  msgid "     Subkey fingerprint:"
 -msgstr "               子鑰指紋:"
 +msgstr ""
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
 +#: g10/keylist.c:1726
  msgid " Primary key fingerprint:"
 -msgstr "                主鑰指紋:"
 +msgstr ""
  
 +#: g10/keylist.c:1728 g10/keylist.c:1738
  msgid "      Subkey fingerprint:"
 -msgstr "                子鑰指紋:"
 +msgstr ""
  
 -#  use tty
 +#: g10/keylist.c:1733 g10/keylist.c:1749
  msgid "      Key fingerprint ="
 -msgstr "      金鑰指紋 ="
 +msgstr ""
  
 +#: g10/keylist.c:1800
  msgid "      Card serial no. ="
 -msgstr "      卡片序號 ="
 +msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
 -msgstr "快取鑰匙圈 '%s' 中\n"
 +msgstr ""
  
- #: g10/keyring.c:1572
 -#, fuzzy, c-format
 -#| msgid "%lu keys cached so far (%lu signatures)\n"
++#: g10/keyring.c:1586
 +#, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
 -msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyring.c:1588
 -#, fuzzy, c-format
 -#| msgid "flush the cache"
++#: g10/keyring.c:1602
 +#, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
 -msgstr[0] "清除快取"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyring.c:1590
 -#, fuzzy, c-format
 -#| msgid "1 bad signature\n"
++#: g10/keyring.c:1604
 +#, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
 -msgstr[0] "1 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
 -msgstr "%s: 鑰匙圈已建立\n"
 +msgstr ""
  
 +#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
@@@ -5113,284 -4177,226 +5129,284 @@@ 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:1238 g10/mainproc.c:1281
  msgid "no signature found\n"
 -msgstr "找不到簽章\n"
 +msgstr ""
  
 +#: g10/mainproc.c:1612
  #, c-format
  msgid "BAD signature from \"%s\""
 -msgstr "*損壞* 的簽章來自於 \"%s\""
 +msgstr ""
  
 +#: g10/mainproc.c:1614
  #, c-format
  msgid "Expired signature from \"%s\""
 -msgstr "過期的簽章來自於 \"%s\""
 +msgstr ""
  
 +#: g10/mainproc.c:1616
  #, c-format
  msgid "Good signature from \"%s\""
 -msgstr "完好的簽章來自於 \"%s\""
 +msgstr ""
  
 +#: g10/mainproc.c:1635
  msgid "signature verification suppressed\n"
 -msgstr "簽章驗證已抑制\n"
 +msgstr ""
  
 +#: g10/mainproc.c:1744
  msgid "can't handle this ambiguous signature data\n"
 -msgstr "無法處理這個不明確的簽章資料\n"
 +msgstr ""
  
 +#: g10/mainproc.c:1758 g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s\n"
 -msgstr "由 %s 建立的簽章\n"
 +msgstr ""
  
 +#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
 -msgstr "               使用 %s 金鑰 %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
 -msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "                aka \"%s\""
 +#: g10/mainproc.c:1777
 +#, c-format
  msgid "               issuer \"%s\"\n"
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
 +#: g10/mainproc.c:1794
  msgid "Key available at: "
 -msgstr "可用的金鑰於: "
 +msgstr ""
  
 +#: g10/mainproc.c:2029
  msgid "[uncertain]"
 -msgstr "[ 不確定 ]"
 +msgstr ""
  
 +#: g10/mainproc.c:2067
  #, c-format
  msgid "                aka \"%s\""
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
 +#: g10/mainproc.c:2150
  #, c-format
  msgid "Signature expired %s\n"
 -msgstr "這份簽署已經在 %s 過期了\n"
 +msgstr ""
  
 +#: g10/mainproc.c:2154
  #, c-format
  msgid "Signature expires %s\n"
 -msgstr "這份簽署將在 %s 到期\n"
 +msgstr ""
  
 +#: 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:2166
  msgid "binary"
 -msgstr "二進制"
 +msgstr ""
  
 +#: g10/mainproc.c:2167
  msgid "textmode"
 -msgstr "文字模式"
 +msgstr ""
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
 -msgstr "未知"
 +msgstr ""
  
 +#: g10/mainproc.c:2169
  msgid ", key algorithm "
 -msgstr ", 金鑰演算法 "
 +msgstr ""
  
 +#: g10/mainproc.c:2204
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
@@@ -5500,135 -4486,107 +5516,135 @@@ msgstr "
  #, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 -msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
 +msgstr ""
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
 -msgstr "未壓縮"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  msgid "uncompressed|none"
 -msgstr "uncompressed|none|未壓縮|無"
 +msgstr ""
  
 +#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
 -msgstr "這個訊息對 %s 來說無法使用\n"
 +msgstr ""
  
 +#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
 -msgstr "不明確的選項 '%s'\n"
 +msgstr ""
  
 +#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
 -msgstr "未知的選項 '%s'\n"
 +msgstr ""
  
 +#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 -msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "Unknown signature type '%s'\n"
 +#: g10/misc.c:1757
 +#, c-format
  msgid "unknown weak digest '%s'\n"
 -msgstr "未知的簽章種類 '%s'\n"
 +msgstr ""
  
 +#: g10/openfile.c:84
  #, c-format
  msgid "File '%s' exists. "
 -msgstr "檔案 '%s' 已存在. "
 +msgstr ""
  
 +#: g10/openfile.c:88
  msgid "Overwrite? (y/N) "
 -msgstr "是否覆寫? (y/N) "
 +msgstr ""
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
 -msgstr "%s: 未知的副檔名\n"
 +msgstr ""
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
 -msgstr "請輸入新的檔名"
 +msgstr ""
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
 -msgstr "寫到標準輸出中\n"
 +msgstr ""
  
 +#: g10/openfile.c:366
  #, c-format
  msgid "assuming signed data in '%s'\n"
 -msgstr "假設被簽署的資料在 '%s'\n"
 +msgstr ""
  
 +#: g10/openfile.c:457
  #, c-format
  msgid "new configuration file '%s' created\n"
 -msgstr "新的組態檔案 '%s' 已建立\n"
 +msgstr ""
  
 +#: g10/openfile.c:498
  #, c-format
  msgid "WARNING: options in '%s' are not yet active during this run\n"
 -msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
 -msgstr "無法操作 %d 公開金鑰演算法\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 -msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
 -msgstr "%d 類別的子封包設定了關鍵位元\n"
 +msgstr ""
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
 -msgstr "代理程式的問題: %s\n"
 +msgstr ""
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
 -msgstr "請輸入密語\n"
 +msgstr ""
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
 -msgstr "由使用者所取消\n"
 +msgstr ""
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
 -msgstr " (主要金鑰 ID %s)"
 +msgstr ""
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 -msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
 -msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 -msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
 -msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 +msgstr ""
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -5940,154 -4862,123 +5956,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:1274
  msgid "skipped: public key already set as default recipient\n"
 -msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:1219
  msgid "Public key is disabled.\n"
 -msgstr "公鑰已停用.\n"
 +msgstr ""
  
 +#: g10/pkclist.c:1229
  msgid "skipped: public key already set\n"
 -msgstr "已跳過: 公鑰已設過\n"
 +msgstr ""
  
 +#: g10/pkclist.c:1264
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
 -msgstr "未知的預設收件者 \"%s\"\n"
 +msgstr ""
  
 +#: g10/pkclist.c:1313
  msgid "no valid addressees\n"
 -msgstr "沒有有效的地址\n"
 +msgstr ""
  
 +#: g10/pkclist.c:1666
  #, c-format
  msgid "Note: key %s has no %s feature\n"
 -msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 +msgstr ""
  
 +#: 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:614
  msgid "Detached signature.\n"
 -msgstr "分離的簽章.\n"
 +msgstr ""
  
 +#: g10/plaintext.c:622
  msgid "Please enter name of data file: "
 -msgstr "請輸入資料檔的名稱: "
 +msgstr ""
  
 +#: g10/plaintext.c:659
  msgid "reading stdin ...\n"
 -msgstr "正在讀取標準輸入中 ...\n"
 +msgstr ""
  
 +#: g10/plaintext.c:704
  msgid "no signed data\n"
 -msgstr "沒有被簽署過的資料\n"
 +msgstr ""
  
 +#: g10/plaintext.c:722
  #, c-format
  msgid "can't open signed data '%s'\n"
 -msgstr "無法開啟被簽署過的資料 '%s'\n"
 +msgstr ""
  
 +#: 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
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 -msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
 +msgstr ""
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
 -msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
 +msgstr ""
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  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: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"
@@@ -6288,237 -5177,191 +6304,237 @@@ msgstr "
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
 -msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 +msgstr ""
  
 +#: g10/sign.c:331
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
 -msgstr "%s/%s 簽章來自: \"%s\"\n"
 +msgstr ""
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 +msgstr ""
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
 -msgstr "簽署:"
 +msgstr ""
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, 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: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
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
 -msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
 +msgstr ""
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
 -msgstr "'%s' 讀取錯誤: %s\n"
 +msgstr ""
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 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:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, 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 ""
  
 -#, 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:302 g10/tofu.c:325 g10/tofu.c:899
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
@@@ -6542,45 -5383,40 +6558,45 @@@ msgstr "
  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"
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
 +#, c-format
  msgid "error reading TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
 -#, 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 ""
  
 -#, 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 ""
  
 -#, 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:1149 g10/tofu.c:3407 g10/tofu.c:3521
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
 +#, c-format
  msgid "error updating TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tofu.c:1328
  #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
@@@ -6741,130 -5551,107 +6757,130 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
 -#, 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:2601
 -#, fuzzy, c-format
 -#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:2605
 +#, c-format
  msgid "error setting TOFU binding's policy to %s\n"
 -msgstr "設定 OCSP 目標時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:2794
 -#, fuzzy, c-format
 -#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:2801
 +#, c-format
  msgid "error changing TOFU policy: %s\n"
 -msgstr "建立管道時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
 -#, fuzzy, c-format
 -#| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:3124
 +#, c-format
  msgid "%s: Verified 0 signatures."
 -msgstr "已經刪除了 %d 份簽章.\n"
 +msgstr ""
  
- #: g10/tofu.c:3117
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:3132
 +#, c-format
  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:3127
 -#, fuzzy
 -#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:3142
  msgid "Encrypted 0 messages."
 -msgstr "已用 %lu 個密語加密了\n"
 +msgstr ""
  
- #: g10/tofu.c:3135
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:3150
 +#, c-format
  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:3146
 -#, fuzzy, c-format
 -#| msgid "validity: %s"
++#: g10/tofu.c:3161
 +#, c-format
  msgid "(policy: %s)"
 -msgstr "有效性: %s"
 +msgstr ""
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -6879,144 -5666,116 +6895,144 @@@ msgid_plural "
  "  %s\n"
  "to mark it as being bad.\n"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: 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"
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
 +#, c-format
  msgid "error opening TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
 -#, fuzzy, c-format
 -#| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3885
 +#, 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:348
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
 -msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 +msgstr ""
  
 +#: 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:429
  msgid "You may try to re-create the trustdb using the commands:\n"
 -msgstr "你可以試著用下列指令來重建信任資料庫:\n"
 +msgstr ""
  
 +#: g10/trustdb.c:438
  msgid "If that does not work, please consult the manual\n"
 -msgstr "如果行不通的話, 請查閱手冊\n"
 +msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 -msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
 -msgstr "正在使用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
 -msgstr "不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
 -msgstr "下次信任資料庫檢查將於 %s 進行\n"
 +msgstr ""
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
 -msgstr "找不到公鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
 -msgstr "請做一次 --check-trustdb\n"
 +msgstr ""
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
 -msgstr "正在檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:1910
 -#, fuzzy, c-format
 -#| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1941
 +#, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
 -msgstr[0] "目前已處理 %lu 把金鑰\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/trustdb.c:1913
 -#, fuzzy, c-format
 -#| msgid "%d keys processed (%d validity counts cleared)\n"
++#: g10/trustdb.c:1944
 +#, 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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
 -msgstr "沒有找到任何徹底信任的金鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
 -msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
 -msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 +msgstr ""
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7114,53 -5866,42 +7130,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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."
@@@ -7170,571 -5910,458 +7186,580 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
 -msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 +msgstr ""
  
 +#: scd/app-openpgp.c:801
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
 -msgstr "存放指紋失敗: %s\n"
 +msgstr ""
  
 +#: scd/app-openpgp.c:814
  #, c-format
  msgid "failed to store the creation date: %s\n"
 -msgstr "存放創生日期失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
 -msgstr "從卡片取回 CHV 狀態時出錯\n"
++msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
 -msgstr "回應中未包含 RSA 系數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
 -msgstr "回應中未包含 RSA 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1355
 -#, fuzzy
 -#| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1453
  msgid "response does not contain the EC public key\n"
 -msgstr "回應中未包含 EC 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
 -msgstr "回應中未包含公鑰資料\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
 -msgstr "讀取公鑰時失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
 -msgstr "以 %s 做為預設 PIN\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2084
  #, c-format
- msgid "PIN for CHV%d is too short; minimum length is %d\n"
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 -msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
++msgstr ""
+ 
 -#, fuzzy
 -#| msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ msgid "||Please unlock the card"
 -msgstr "||請輸入個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
- msgid "verify CHV%d failed: %s\n"
+ msgid "PIN for CHV%d is too short; minimum length is %d\n"
 -msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
+ #, c-format
+ msgid "verify CHV%d failed: %s\n"
 -msgstr "驗證 CHV%d 失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
 -msgstr "卡片永久鎖定了!!\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2076
 -#, fuzzy, c-format
 -#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
++#: scd/app-openpgp.c:2234
 +#, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
  "%d Admin PIN attempts remaining before card is permanently locked\n"
 -msgstr[0] "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\n"
 +msgstr[0] ""
 +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:2086
- #, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr ""
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
 -msgstr "|A|請輸入管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
 -msgstr "管理者指令存取權限尚未組態\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
 -msgstr "||請輸入個人識別碼 (PIN)"
++msgstr ""
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
 -msgstr "||請輸入卡片的重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
 -msgstr "|RN|新增重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
 -msgstr "|AN|新增管理者個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
 -msgstr "|N|新增個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
 -msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
 -msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
 -msgstr "讀取應用程式資料時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
 -msgstr "讀取指紋 DO 時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
 -msgstr "金鑰已存在\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
 -msgstr "既有的金鑰將被取代\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
 -msgstr "正在產生新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
 -msgstr "正在寫入新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
 -msgstr "缺漏創生時間戳印\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
 -msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
 -msgstr "存放金鑰失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3538
 -#, fuzzy
 -#| msgid "unsupported inquiry '%s'\n"
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
 -msgstr "未支援的查詢 '%s'\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
 -msgstr "正在產生金鑰中, 請稍候 ...\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
 -msgstr "產生金鑰時失敗\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3819
 -#, fuzzy, c-format
 -#| msgid "key generation completed (%d seconds)\n"
++#: scd/app-openpgp.c:3974
 +#, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 -msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
 -msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
 -msgstr "卡片不支援 %s 摘要演算法\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
 -msgstr "目前建立的簽章: %lu\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
 -msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
 -msgstr "|等級|設定除錯等級為指定等級"
 +msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
 -msgstr "|檔案|將日誌寫入至指定檔案"
 +msgstr ""
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
 -msgstr "|N|從 N 埠連線至讀卡機"
 +msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
 -msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
 +msgstr ""
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
 -msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
 +msgstr ""
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
 -msgstr "不要使用內部的 CCID 驅動程式"
 +msgstr ""
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
 -msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 +msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
 -msgstr "不要使用讀卡機鍵盤"
 +msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
 -msgstr "禁用管理者卡片指令"
 +msgstr ""
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
 -msgstr "輸入 PIN 時在輸入區顯示成變動長度"
 +msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 -msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
 -"語法: scdaemon [選項] [指令 [引數]]\n"
 -"@GNUPG@ 智慧卡服務\n"
  
 +#: scd/scdaemon.c:789
  msgid "please use the option '--daemon' to run the program in the background\n"
 -msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
 -msgstr "用於 fd %d 的經手程式已啟動\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, 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 ""
- 
 -#, 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
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
 -msgstr "未支援關鍵憑證擴充欄位 %s"
 +msgstr ""
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  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
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
 -msgstr "請注意: 不允許非關鍵的憑證原則"
 +msgstr ""
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
 -msgstr "有效性無效的憑證: %s"
 +msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  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
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  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
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, 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
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  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
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
 -msgstr "憑證鏈太長\n"
 +msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
 -msgstr "找不到發行者憑證"
 +msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
 -msgstr "憑證有 不良 簽章"
 +msgstr ""
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
 -msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 +msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, 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
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  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
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
 -msgstr "(這是 MD2 演算法)\n"
 +msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  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 "
@@@ -7743,543 -6370,431 +7768,543 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
 -"請輸入密語來解開 X.509 憑證所需的私鑰:\n"
 -"\"%s\"\n"
 -"S/N %s, ID 0x%08lX,\n"
 -"建立於 %s, 於 %s 到期.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
 -msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
 +msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
 -msgstr "取得金鑰用途資訊時出錯: %s\n"
 +msgstr ""
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
 -msgstr "憑證應該還未被用於憑證\n"
 +msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
 -msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 +msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
 -msgstr "憑證應該還未被用於加密\n"
 +msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
 -msgstr "憑證應該還未被用於簽署\n"
 +msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
 -msgstr "憑證無法用於加密\n"
 +msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
 -msgstr "憑證無法用於簽署\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:464
  #, c-format
  msgid "line %d: invalid algorithm\n"
 -msgstr "第 %d 列: 無效的演算法\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 -msgstr "第 %d 列: 金鑰長度 %u 無效 (有效範圍是從 %d 至 %d)\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:496
  #, c-format
  msgid "line %d: no subject name given\n"
 -msgstr "第 %d 列: 沒有給定的物件名稱\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:505
  #, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
 -msgstr "第 %d 列: 無效的主旨名稱標籤 '%.*s'\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:508
  #, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
 -msgstr "第 %d 列: 無效的主旨名稱 '%s'  於第 %d 位置\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:525
  #, c-format
  msgid "line %d: not a valid email address\n"
 -msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:544
  #, c-format
  msgid "line %d: invalid serial number\n"
 -msgstr "第 %d 列: 無效的序號\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
 -msgstr "第 %d 列: 無效的發行者名稱標籤 '%.*s'\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:563
  #, c-format
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
 -msgstr "第 %d 列: 無效的發行者名稱 '%s'  於第 %d 位置\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, c-format
  msgid "line %d: invalid date given\n"
 -msgstr "第 %d 列: 無效的給定日期\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:599
  #, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 -msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得簽署金鑰時出錯: %s\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:618
  #, c-format
  msgid "line %d: invalid hash algorithm given\n"
 -msgstr "第 %d 列: 無效的給定雜湊演算法\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:633
  #, c-format
  msgid "line %d: invalid authority-key-id\n"
 -msgstr "第 %d 列: 無效的 authority-key-id\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:648
  #, c-format
  msgid "line %d: invalid subject-key-id\n"
 -msgstr "第 %d 列: 無效的 subject-key-id\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:686
  #, c-format
  msgid "line %d: invalid extension syntax\n"
 -msgstr "第 %d 列: 無效的擴充語法\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:699
  #, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
 -msgstr "第 %d 列: 從卡片讀取金鑰 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:712
  #, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
 -msgstr "第 %d 列: 以金鑰鑰柄 '%s' 取得金鑰時出錯: %s\n"
 +msgstr ""
  
 +#: sm/certreqgen.c:729
  #, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
 -msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
 +msgstr ""
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
 -msgstr "如欲完成此憑證請求, 請再輸入一次你剛才建立的金鑰密語.\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
 -msgstr "   (%d) RSA\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
 -msgstr "   (%d) 現有的金鑰\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
 -msgstr "   (%d) 卡片上現存的金鑰\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
 -msgstr "讀取卡片時出錯: %s\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
 -msgstr "卡片序號: %s\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
 -msgstr "可用金鑰:\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
 -msgstr "%s 金鑰可能的動作:\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
 -msgstr "   (%d) 簽署, 加密\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
 -msgstr "   (%d) 簽署\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
 -msgstr "   (%d) 加密\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
 -msgstr "請輸入 X.509 主旨名稱: "
 +msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
 -msgstr "沒有給定的物件名稱\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
 -msgstr "無效的主旨名稱標籤 '%.*s'\n"
 +msgstr ""
  
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
 -msgstr "無效的主旨名稱 '%s'\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 -msgstr "16"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
 -msgstr "請輸入電子郵件地址"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
 -msgstr " (以空白列結束):\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
 -msgstr "請輸入 DNS 名稱"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
 -msgstr " (非必要; 以空白列結束):\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
 -msgstr "請輸入 URI"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
 -msgstr "要建立自簽憑證嗎? (y/N) "
 +msgstr ""
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
 -msgstr "採用下列這些參數:\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
 -msgstr "現在正在建立自簽憑證.  "
 +msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
 -msgstr "現在正在建立憑證請求.  "
 +msgstr ""
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
 -msgstr "這可能會花點時間 ...\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
 -msgstr "準備妥當.\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
 -msgstr "準備好了.  你現在就該把此請求送到你的 CA.\n"
 +msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
 -msgstr "資源問題: 超出核心\n"
 +msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
 -msgstr "(這是 RC2 演算法)\n"
 +msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  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:219
  msgid "import certificates"
 -msgstr "匯入憑證"
 +msgstr ""
  
 +#: sm/gpgsm.c:220
  msgid "export certificates"
 -msgstr "匯出憑證"
 +msgstr ""
  
 +#: sm/gpgsm.c:228
  msgid "register a smartcard"
 -msgstr "註冊智慧卡"
 +msgstr ""
  
 +#: sm/gpgsm.c:231
  msgid "pass a command to the dirmngr"
 -msgstr "將指令遞送給 dirmngr"
 +msgstr ""
  
 +#: sm/gpgsm.c:233
  msgid "invoke gpg-protect-tool"
 -msgstr "叫用 gpg-protect-tool"
 +msgstr ""
  
 +#: sm/gpgsm.c:250
  msgid "create base-64 encoded output"
 -msgstr "建立以 base-64 編碼過的輸出"
 +msgstr ""
  
 +#: sm/gpgsm.c:258
  msgid "assume input is in PEM format"
 -msgstr "假設輸入的是 PEM 格式"
 +msgstr ""
  
 +#: sm/gpgsm.c:260
  msgid "assume input is in base-64 format"
 -msgstr "假設輸入的是 base-64 格式"
 +msgstr ""
  
 +#: sm/gpgsm.c:262
  msgid "assume input is in binary format"
 -msgstr "假設輸入的是二進制格式"
 +msgstr ""
  
 +#: sm/gpgsm.c:269
  msgid "never consult a CRL"
 -msgstr "永遠不要查閱 CRL"
 +msgstr ""
  
 +#: sm/gpgsm.c:279
  msgid "check validity using OCSP"
 -msgstr "用 OCSP 檢查有效性"
 +msgstr ""
  
 +#: sm/gpgsm.c:284
  msgid "|N|number of certificates to include"
 -msgstr "|N|要包含的憑證數量"
 +msgstr ""
  
 +#: sm/gpgsm.c:287
  msgid "|FILE|take policy information from FILE"
 -msgstr "|檔案|從指定檔案中取得原則資訊"
 +msgstr ""
  
 +#: sm/gpgsm.c:290
  msgid "do not check certificate policies"
 -msgstr "不要檢查憑證原則"
 +msgstr ""
  
 +#: sm/gpgsm.c:294
  msgid "fetch missing issuer certificates"
 -msgstr "取回遺失的發行者憑證"
 +msgstr ""
  
 +#: sm/gpgsm.c:305
  msgid "don't use the terminal at all"
 -msgstr "完全不要使用終端機"
 +msgstr ""
  
 +#: sm/gpgsm.c:307
  msgid "|FILE|write a server mode log to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
 +#: sm/gpgsm.c:312
  msgid "|FILE|write an audit log to FILE"
 -msgstr "|檔案|將稽核日誌寫入至指定檔案"
 +msgstr ""
  
 +#: sm/gpgsm.c:315
  msgid "batch mode: never ask"
 -msgstr "批次模式: 永遠不詢問"
 +msgstr ""
  
 +#: sm/gpgsm.c:316
  msgid "assume yes on most questions"
 -msgstr "假設大部分的問題都回答是"
 +msgstr ""
  
 +#: sm/gpgsm.c:317
  msgid "assume no on most questions"
 -msgstr "假設大部分的問題都回答否"
 +msgstr ""
  
 +#: sm/gpgsm.c:320
  msgid "|FILE|add keyring to the list of keyrings"
 -msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 +msgstr ""
  
 +#: sm/gpgsm.c:323
  msgid "|USER-ID|use USER-ID as default secret key"
 -msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
 -msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 +msgstr ""
  
 +#: sm/gpgsm.c:350
  msgid "|NAME|use cipher algorithm NAME"
 -msgstr "|名稱|使用指定名稱的編密演算法"
 +msgstr ""
  
 +#: sm/gpgsm.c:352
  msgid "|NAME|use message digest algorithm NAME"
 -msgstr "|名稱|使用指定名稱的訊息摘要演算法"
 +msgstr ""
  
 +#: sm/gpgsm.c:559
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 -msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
 +#: 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:766
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
 -msgstr "請注意: 將無法加密為 '%s': %s\n"
 +msgstr ""
  
 +#: sm/gpgsm.c:777
  #, c-format
  msgid "unknown validation model '%s'\n"
 -msgstr "未知的驗證模型 '%s'\n"
 +msgstr ""
  
 +#: 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:847 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
 -msgstr "%s:%u: 給定的密碼沒有使用者\n"
 +msgstr ""
  
 +#: 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:1427
  msgid "could not parse keyserver\n"
 -msgstr "無法剖析金鑰伺服器\n"
 +msgstr ""
  
 +#: sm/gpgsm.c:1630
  #, c-format
  msgid "importing common certificates '%s'\n"
 -msgstr "正在匯入通用憑證 '%s'\n"
 +msgstr ""
  
 +#: sm/gpgsm.c:1671
  #, c-format
  msgid "can't sign using '%s': %s\n"
 -msgstr "無法用 '%s' 來簽署: %s\n"
 +msgstr ""
  
 +#: 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
++#: sm/import.c:472 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
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
 -msgstr "匯入憑證時出錯: %s\n"
 +msgstr ""
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 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"
@@@ -8289,8 -6804,12 +8314,8 @@@
  "\n"
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
 -"你正要用你的這個憑證來建立簽章:\n"
 -"\"%s\"\n"
 -"這會建立出在法律上與簽名等效的合格簽章.\n"
 -"\n"
 -"%s%s請問你是否真的確定要這樣做了?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8303,1861 -6821,1484 +8328,1862 @@@ msgid "
  "\"%s\"\n"
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
 -"你正要用你的這個憑證來建立簽章:\n"
 -"\"%s\"\n"
 -"請注意, 這個憑證並 不會 建立出合格的簽章!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 -msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
 +msgstr ""
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
 -msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
 +msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
 -msgstr "檢查合格憑證時失敗: %s\n"
 +msgstr ""
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
 -msgstr "簽章建立於 "
 +msgstr ""
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
 -msgstr "[   未給定日期  ]"
 +msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
 -msgstr " 以憑證 ID 0x%08lX\n"
 +msgstr ""
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
 -msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
 +msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
 -msgstr "完好的簽章來自於"
 +msgstr ""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
 -msgstr "                亦即"
 +msgstr ""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
 -msgstr "這是一份合格簽章\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
 -msgstr "無法啟始憑證快取鎖定: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
 -msgstr "無法取得憑證快取的讀取鎖定: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
 -msgstr "無法取得憑證快取的寫入鎖定: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
 -msgstr "無法釋放憑證快取鎖定: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
 -msgstr "正在從快取中拋棄 %u 份憑證\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
 -msgstr "無法剖析憑證 '%s': %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
 -msgstr "憑證 '%s' 已快取\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
 -msgstr "信任的憑證 '%s' 已載入\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
 -msgstr "憑證 '%s' 已載入\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
 -msgstr "  SHA1 指紋 = %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
 -msgstr "   發行者 ="
 +msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
 -msgstr "  主旨 ="
 +msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
 -msgstr "載入憑證 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
 -msgstr "固定載入的憑證: %u\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
 -msgstr "    執行時期快取的憑證: %u\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
 -#, fuzzy, c-format
 -#| msgid "    runtime cached certificates: %u\n"
++#: dirmngr/certcache.c:805
++#, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 -msgstr "    執行時期快取的憑證: %u\n"
++msgstr ""
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
 -msgstr "憑證早已快取\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
 -msgstr "憑證已快取\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
 -msgstr "快取憑證時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
 -msgstr "無效的 SHA1 指紋字串 '%s'\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
 -msgstr "以序號取得憑證時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
 -msgstr "以主旨取得憑證時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
 -msgstr "憑證中找不到發行者\n"
 +msgstr ""
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
 -msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:213
  #, c-format
  msgid "creating directory '%s'\n"
 -msgstr "正在建立目錄 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:217
  #, c-format
  msgid "error creating directory '%s': %s\n"
 -msgstr "建立目錄 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:245
  #, c-format
  msgid "ignoring database dir '%s'\n"
 -msgstr "正在忽略資料庫目錄 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:254
  #, c-format
  msgid "error reading directory '%s': %s\n"
 -msgstr "讀取目錄 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:275
  #, c-format
  msgid "removing cache file '%s'\n"
 -msgstr "正在移除快取檔案 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:284
  #, c-format
  msgid "not removing file '%s'\n"
 -msgstr "不移除檔案 '%s'\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
 -msgstr "關閉快取檔案時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, c-format
  msgid "failed to open cache dir file '%s': %s\n"
 -msgstr "開啟快取目錄檔案 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:421
  #, c-format
  msgid "error creating new cache dir file '%s': %s\n"
 -msgstr "建立新快取目錄檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:428
  #, c-format
  msgid "error writing new cache dir file '%s': %s\n"
 -msgstr "寫入新快取目錄檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:435
  #, c-format
  msgid "error closing new cache dir file '%s': %s\n"
 -msgstr "關閉新快取目錄檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:440
  #, c-format
  msgid "new cache dir file '%s' created\n"
 -msgstr "新的快取目錄檔案 '%s' 已建立\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:445
  #, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
 -msgstr "重新開啟快取目錄檔案 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
 -msgstr "第一個 '%s' 記錄並非版本\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:488
  msgid "old version of cache directory - cleaning up\n"
 -msgstr "舊版的快取目錄 - 正在清理\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:504
  msgid "old version of cache directory - giving up\n"
 -msgstr "舊版的快取目錄 - 正在放棄\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:615
  #, c-format
  msgid "extra field detected in crl record of '%s' line %u\n"
 -msgstr "'%s' 的 crl 記錄內偵測到額外的欄位位於第 %u 列\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, c-format
  msgid "invalid line detected in '%s' line %u\n"
 -msgstr "偵測到 '%s' 第 %u 列有無效的列\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:632
  #, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
 -msgstr "偵測到 '%s' 第 %u 列有重複的項目\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
 -msgstr "'%s' 第 %u 列有未支援的紀錄類型故已跳過\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
 -msgstr "'%s' 第 %u 列有無效的發行者雜湊\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:679
  #, c-format
  msgid "no issuer DN in '%s' line %u\n"
 -msgstr "'%s' 第 %u 列沒有發行者 DN\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:686
  #, c-format
  msgid "invalid timestamp in '%s' line %u\n"
 -msgstr "'%s' 第 %u 列有無效的時間戳印\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:692
  #, c-format
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 -msgstr "警告: '%s' 第 %u 列有無效的快取檔案雜湊\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
 -msgstr "已於快取 dir 檔案內偵測到錯誤\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:699
  msgid "please check the reason and manually delete that file\n"
 -msgstr "請檢查其原因並手動刪除該檔案\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
 -msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:937
  #, c-format
  msgid "error closing '%s': %s\n"
 -msgstr "關閉 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:949
  #, c-format
  msgid "error renaming '%s' to '%s': %s\n"
 -msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1003
  #, c-format
  msgid "can't hash '%s': %s\n"
 -msgstr "無法計算 '%s' 的雜湊: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1011
  #, c-format
  msgid "error setting up MD5 hash context: %s\n"
 -msgstr "設定 MD5 雜湊脈絡時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1027
  #, c-format
  msgid "error hashing '%s': %s\n"
 -msgstr "計算 '%s' 的雜湊時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1055
  #, c-format
  msgid "invalid formatted checksum for '%s'\n"
 -msgstr "無效的 '%s' 格式化加總檢核碼\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
 -msgstr "太多開啟的快取檔案; 無法再開啟更多檔案了\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1126
  #, c-format
  msgid "opening cache file '%s'\n"
 -msgstr "開啟快取檔案 '%s' 時失敗\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1145
  #, c-format
  msgid "error opening cache file '%s': %s\n"
 -msgstr "開啟快取檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
 -msgstr "初始化快取檔案 '%s' 用於讀取時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1175
  msgid "calling unlock_db_file on a closed file\n"
 -msgstr "正在對已關閉的檔案叫用 unlock_db_file\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1177
  msgid "calling unlock_db_file on an unlocked file\n"
 -msgstr "正在對已解除鎖定的檔案叫用 unlock_db_file\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, c-format
  msgid "failed to create a new cache object: %s\n"
 -msgstr "建立新快取物件失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1286
  #, c-format
  msgid "no CRL available for issuer id %s\n"
 -msgstr "發行者 ID %s 沒有可用的 CRL\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
 -msgstr "發行者 ID %s 的快取 CRL 太過老舊; 需要更新\n"
 +msgstr ""
  
 +#: 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 啟用且已經過 %d 分鐘 (發行者 ID %s); 需要更新\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1315
  #, c-format
  msgid "force-crl-refresh active for issuer id %s; update required\n"
 -msgstr "force-crl-refresh 啟用 (發行者 ID %s); 需要更新\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1324
  #, c-format
  msgid "available CRL for issuer ID %s can't be used\n"
 -msgstr "發行者 ID %s 的可用 CRL 無法使用\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1335
  #, c-format
  msgid "cached CRL for issuer id %s tampered; we need to update\n"
 -msgstr "發行者 ID %s 的快取 CRL 已遭竄改; 我們需要更新\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1347
  msgid "WARNING: invalid cache record length for S/N "
 -msgstr "警告: 快取記錄長度無效, S/N"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1357
  #, c-format
  msgid "problem reading cache record for S/N %s: %s\n"
 -msgstr "讀取序號 %s 的快取記錄時發生問題: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 -msgstr "S/N %s 無效; 原因=%02X  日期=%.15s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1371
  #, c-format
  msgid "S/N %s is valid, it is not listed in the CRL\n"
 -msgstr "S/N %s 有效, 但位列入 CRL 內\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, c-format
  msgid "error getting data from cache file: %s\n"
 -msgstr "從快取檔案取得資料時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
 -msgstr "未知的雜湊演算法 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
 -msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
  msgid "got an invalid S-expression from libksba\n"
 -msgstr "從 libksba 得到無效的 S-表示式\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
 -msgstr "轉換 S-表示式時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
 -msgstr "建立 S-表示式時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1699
  #, c-format
  msgid "ksba_crl_parse failed: %s\n"
 -msgstr "ksba_crl_parse 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1714
  #, c-format
  msgid "error getting update times of CRL: %s\n"
 -msgstr "取得 CRL 更新時間時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
 -msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1725
  msgid "nextUpdate not given; assuming a validity period of one day\n"
 -msgstr "無給定 nextUpdate; 先假設有效期是一天\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1745
  #, c-format
  msgid "error getting CRL item: %s\n"
 -msgstr "取得 CRL 項目時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1760
  #, c-format
  msgid "error inserting item into temporary cache file: %s\n"
 -msgstr "安插項目至暫存快取檔案時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1787
  #, c-format
  msgid "no CRL issuer found in CRL: %s\n"
 -msgstr "CRL 中找不到 CRL 發行者: %s\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 -msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證位置\n"
 +msgstr ""
  
 +#: dirmngr/crlcache.c:1847
  #, c-format
  msgid "CRL signature verification failed: %s\n"
 -msgstr "CRL 簽章驗證失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
 -msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
 -msgstr "ksba_crl_new 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
 -msgstr "ksba_crl_set_reader 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
 -msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
 -msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
 -msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
 -msgstr "crl_parse_insert 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
 -msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
 -msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 -msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
 -msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
 -msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
 -msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
 -msgstr "建立快取檔案 '%s' 時出錯\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
 -msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
 -msgstr "更新 DIR 檔案時失敗 - 下次程式啟動時將失去快取項目\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
 -msgstr "開始 CRL 傾印 (經由 %s 取得)\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  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
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 -msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
 -msgstr " 錯誤: 將不採用此 CRL\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
 -msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
 -msgstr " 警告: 無效的快取記錄長度\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
 -msgstr "讀取快取記錄時發生問題: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
 -msgstr "讀取快取金鑰時發生問題: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
 -msgstr "從資料庫讀取快取項目時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
 -msgstr "CRL 傾印結束\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
 -msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
 -msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, 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
++#: dirmngr/crlfetch.c:183
  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
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, 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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
 -msgstr "啟始讀取程式物件時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
 -msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
 -msgstr "太多重新導向\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
 -msgstr "取回 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
 -msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
 -#, fuzzy
 -#| msgid "CRL access not possible due to disabled %s\n"
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
 -msgstr "不可能存取 CRL 因已停用 %s\n"
 +msgstr ""
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, 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:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
 -msgstr "列出 CRL 快取的內容"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
 -msgstr "|檔案|從指定檔案載入 CRL 至快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
 -msgstr "|網址|從指定網址取得 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
 -msgstr "關閉 dirmngr"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
 -msgstr "清除快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
 -msgstr "以不詢問使用者的方式執行"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
 -msgstr "強迫載入過時的 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
 -msgstr "允許送出 OCSP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
 -msgstr "避免使用 HTTP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
 -msgstr "避免使用 LDAP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
 -msgstr "忽略 HTTP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
 -msgstr "忽略 LDAP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
 -msgstr "忽略含有 OCSP 伺服器網址的憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
 -msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
 -msgstr "|主機|指定 LDAP 查詢主機"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
 -msgstr "不要將主機備案與 --ldap-proxy 並用"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
 -msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
 -msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
 -msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
 -msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
 -msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 -msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
  "options)\n"
  msgstr ""
 -"@\n"
 -"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 -msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  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:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
 -msgstr "有效的除錯等級為: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
 -msgstr "用法: %s [選項] "
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
 -msgstr "socket 名稱內不允許使用冒號\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
 -msgstr "%s:%u: 偵測到無效的指紋\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
 -msgstr "%s:%u: 讀取錯誤: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
 -msgstr "%s:%u: 列尾的垃圾已忽略\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 -msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
 -msgstr "收到 SIGUSR2 - 無定義行動\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
 -msgstr "收到 SIGTERM - 正在關閉 ...\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
 -msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
 -msgstr "已強迫關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
 -msgstr "收到 SIGINT - 立即關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, 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:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
 -msgstr "動態記憶體配置失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
 -msgstr "start_cert_fetch: 無效的模式 '%s'\n"
 +msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
 -msgstr "ldap_search 達到伺服器的尺寸限制\n"
 +msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
 -msgstr "發現無效的標準型 S-表示式\n"
 +msgstr ""
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
 -msgstr "gcry_md_open 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
 -msgstr "糟了: ksba_cert_hash 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  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
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
 -msgstr "連線至 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
 -msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
 -msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, 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
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
 -msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
 -msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
 -msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
 +msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
 -msgstr "OCSP 回應僅支援 SHA-1\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
 -msgstr "配置清單項目時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
 -msgstr "取得回應程式 ID 時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
 -msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
 -msgstr "找不到發行者憑證: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
 -msgstr "叫用者未傳為目標憑證\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
 -msgstr "叫用者未傳回發行的憑證\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
 -msgstr "配置 OCSP 脈絡失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
 -msgstr "無法取得 authorityInfoAccess: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
 -msgstr "無定義預設 OCSP 回應程式\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
 -msgstr "未定義預設的 OCSP 簽署程式\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
 -msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
 -msgstr "正在使用 %s OCSP 回應程式\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
 -msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
 -msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
 -msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
 -msgstr "良好"
 +msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
 -msgstr "憑證已撤銷於 %s 因: %s\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
 -msgstr "OCSP 回應程式傳回未來的狀態\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
 -msgstr "OCSP 回應程式傳回非當下的狀態\n"
 +msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  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
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
 -msgstr "assuan_inquire(%s) 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
 -msgstr "遺失 ldapserver"
 +msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
 -msgstr "憑證 ID 中遺失 serialno"
 +msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
 -msgstr "assuan_inquire 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
 -msgstr "fetch_cert_by_url 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
 -msgstr "start_cert_fetch 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
 -msgstr "fetch_next_cert 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
 -msgstr "max_replies %d 已超出\n"
 +msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
 -msgstr "無法配置控制結構: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
 -msgstr "配置 assuan 脈絡失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
 -msgstr "伺服器啟始失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
 -msgstr "向 Assuan 註冊指令時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
 -msgstr "Assuan 接受問題: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
 -msgstr "Assuan 處理時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
 -msgstr "接受未標示為 CA 的根 CA"
 +msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
 -msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
 +msgstr ""
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
 -msgstr "不對此檢查 CRL:"
 +msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
 -msgstr "檢查 CRL: "
 +msgstr ""
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
 -msgstr "自簽憑證有 不良 簽章"
 +msgstr ""
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
 -msgstr "檢查根憑證可信度時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  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 ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
 -msgstr "憑證應該還未被用於 CRL 簽署\n"
 +msgstr ""
  
 +#: 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
 -msgstr "控制著組態的選項"
 +msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
 -msgstr "對除錯有幫助的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
 -msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
 -msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
 -msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
 -msgstr "強制執行密語原則的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
 -msgstr "不允許略過密語原則"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
 -msgstr "|N|把新密語所需的最短長度設成 N"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
 -msgstr "|N|新密語至少要有 N 個非字母的字符"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
 -msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
 -msgstr "|N|在 N 天之後讓密語過期"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
 -msgstr "不允許重複使用舊密語"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:587
 -#, fuzzy
 -#| msgid "|N|set LDAP timeout to N seconds"
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
 -msgstr "|名字|也加密給指定名字的使用者 ID"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
 -msgstr "|SPEC|設定電子郵件別名"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
 -msgstr "金鑰伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
 -msgstr "|URL|使用位於 URL 的金鑰伺服器"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
 -msgstr "允許 PKA 查找 (DNS 請求)"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 -msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
 -msgstr "停用所有的 dirmngr 存取"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 -msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
 -msgstr "不要為根憑證檢查 CRL"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
 -msgstr "控制著輸出格式的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
 -msgstr "控制著互動及強制執行的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:933
 -#, fuzzy
 -#| msgid "Options controlling the security"
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
 -msgstr "HTTP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
 -msgstr "使用系統的 HTTP 代理伺服器設定"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
 -msgstr "要用的 LDAP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
 -msgstr "LDAP 伺服器清單"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
 -msgstr "OCSP 組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1081
 -#, fuzzy
 -#| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
 -msgstr "OpenPGP 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
 -#, fuzzy
 -#| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
 -msgstr "智慧卡服務"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1084
 -#, fuzzy
 -#| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
 -msgstr "S/MIME 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
 -#, fuzzy
 -#| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1093
  msgid "Passphrase Entry"
 -msgstr "個人識別碼及密語項目"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
 -msgstr "元件不適合啟動"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
 -msgstr "元件 %s 的外部驗證失敗"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
 -msgstr "請注意群組規格已忽略\n"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:4094
 -#, fuzzy, c-format
 -#| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4125
 +#, c-format
  msgid "error closing '%s'\n"
 -msgstr "關閉 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:4096
 -#, fuzzy, c-format
 -#| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4127
 +#, 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:74
  msgid "check all programs"
 -msgstr "檢查所有的程式"
 +msgstr ""
  
 +#: tools/gpgconf.c:75
  msgid "|COMPONENT|list options"
 -msgstr "|元件|列出選項"
 +msgstr ""
  
 +#: tools/gpgconf.c:76
  msgid "|COMPONENT|change options"
 -msgstr "|元件|變更選項"
 +msgstr ""
  
 +#: tools/gpgconf.c:77
  msgid "|COMPONENT|check options"
 -msgstr "|元件|檢查選項"
 +msgstr ""
  
 +#: tools/gpgconf.c:79
  msgid "apply global default values"
 -msgstr "套用全域預設值"
 +msgstr ""
  
 -#, 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:85
  msgid "list global configuration file"
 -msgstr "列出全域組態檔"
 +msgstr ""
  
 +#: tools/gpgconf.c:87
  msgid "check global configuration file"
 -msgstr "檢查全域組態檔案"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "update the trust database"
 +#: tools/gpgconf.c:89
  msgid "query the software version database"
 -msgstr "更新信任資料庫"
 +msgstr ""
  
 +#: tools/gpgconf.c:90
  msgid "reload all or a given component"
 -msgstr "重新載入所有或給定的元件"
 +msgstr ""
  
 +#: tools/gpgconf.c:91
  msgid "launch a given component"
 -msgstr "啟動給定的元件"
 +msgstr ""
  
 +#: tools/gpgconf.c:92
  msgid "kill a given component"
 -msgstr "刪除給定的元件"
 +msgstr ""
  
 +#: tools/gpgconf.c:98
  msgid "use as output file"
 -msgstr "當作輸出檔案來使用"
 +msgstr ""
  
 +#: tools/gpgconf.c:102
  msgid "activate changes at runtime, if possible"
 -msgstr "如果可能的話, 在執行期啟用變更"
 +msgstr ""
  
 +#: tools/gpgconf.c:127
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
 -msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
 +msgstr ""
  
 +#: tools/gpgconf.c:130
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
diff --cc po/hu.po
index 65ed114,d7d8c11..119dfac
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -15,7 -14,6 +15,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@@ -26,40 -24,31 +26,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "érvénytelen jelszó
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -77,75 -65,59 +77,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "rossz jelszó"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "A sor túl hosszú!\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "A jelszó túl hosszú!\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Érvénytelen karakter a névben!\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "hibás MPI"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "rossz jelszó"
@@@ -155,150 -126,115 +155,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "jelszóváltoztatás"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Ismételje meg a jelszót: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Ismételje meg a jelszót: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Ismételje meg a jelszót: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -383,48 -305,33 +390,48 @@@ msgstr "
  "Opciók:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A kulcsot lecserélték."
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,11 -399,6 +516,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -529,47 -412,34 +536,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s nem hozható létre: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -579,28 -448,22 +586,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
@@@ -628,7 -485,6 +635,7 @@@ msgstr "Bizalmi adatbázis: olvasás si
  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:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -653,12 -505,10 +660,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: kihagyva: %s\n"
@@@ -680,8 -526,6 +687,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -533,6 +696,9 @@@ msgstr "
  "@Parancsok:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -578,6 +752,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -805,8 -627,6 +812,8 @@@ msgstr "
  msgid "Yes"
  msgstr "igen"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -857,19 -670,16 +864,19 @@@ msgstr "jelszóváltoztatás
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "kulcs engedélyezése"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -889,7 -696,6 +896,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
@@@ -916,22 -718,14 +923,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -946,8 -738,6 +953,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -957,12 -746,10 +964,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@@ -1189,8 -930,6 +1196,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1326,7 -1038,10 +1333,12 @@@ msgstr "Hiba a záró sorban!\n
  msgid "[none]"
  msgstr "Ismeretlen módú"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
@@@ -1402,7 -1103,6 +1414,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "nem feldolgozott"
@@@ -1461,8 -1150,6 +1473,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1630,8 -1284,6 +1642,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1292,10 +1653,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Mit választ? "
  
@@@ -1716,17 -1348,11 +1728,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
@@@ -1793,7 -1406,6 +1805,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@@ -1824,13 -1431,10 +1836,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "Felkerekítve %u bitre.\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1885,9 -1479,6 +1897,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Érvénytelen választás.\n"
  
@@@ -2022,23 -1584,15 +2034,23 @@@ msgstr "Érvénytelen parancs! (Próbá
  msgid "--output doesn't work for this command\n"
  msgstr "Az --output opció nem működik ehhez a parancshoz.\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1642,6 +2112,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -2138,7 -1673,6 +2150,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2267,40 -1777,31 +2279,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: kihagyva: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "Írok a \"%s\" állományba.\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "FIGYELEM: Semmit sem exportáltam.\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2583,7 -2023,6 +2595,7 @@@ msgstr "|N|tömörítési szint beáll�
  msgid "use canonical text mode"
  msgstr "kanonikus szöveges mód használata"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|fájl|bővítő modul betöltése"
@@@ -2764,473 -2175,375 +2776,477 @@@ msgstr "FIGYELEM: nem biztonságos kön
  msgid "unknown configuration item '%s'\n"
  msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, 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:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, 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:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s és %s nem használható együtt!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s értelmetlen %s mellett!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "Érvénytelen alapértelmezett preferenciák!\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, 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:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "Visszafejtés sikertelen: %s.\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Kulcsexportálás sikertelen: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "Páncél eltávolítása nem sikerült: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Kezdheti gépelni az üzenetet...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  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:5244
++#: g10/gpg.c:5252
  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:5277
++#: g10/gpg.c:5285
  #, 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"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "a megadott kulcskarikáról vegye a kulcsokat"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Használat: gpgv [opciók] [fájlok] (-h a súgóhoz)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4579,15 -3627,10 +4595,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[visszavont] "
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4628,7 -3665,6 +4644,7 @@@ msgstr "Továbbra is hozzá akarja adni
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4660,7 -3690,6 +4676,7 @@@ msgstr[1] "Töröltem %d aláírást.\n
  msgid "Nothing deleted.\n"
  msgstr "Nem töröltem semmit.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "érvénytelen páncél"
@@@ -4903,74 -3884,58 +4919,74 @@@ msgstr "\"%s\" felhasználói azonosít
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "Sima aláírást írok.\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "Önaláírást írok.\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "Összefűző aláírást írok.\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "adat titkosítása"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -4984,157 -3949,126 +5000,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (csak aláírás)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Aláírás-jelölés: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "A kívánt kulcsméret %u bit.\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5150,7 -4084,6 +5166,7 @@@ msgstr "
  "      <n>m = a kulcs n hónapig érvényes\n"
  "      <n>y = a kulcs n évig érvényes\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5166,40 -4099,32 +5182,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Meddig érvényes a kulcs? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Meddig érvényes az aláírás? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "Érvénytelen érték!\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s lejár: %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Az aláírás lejár: %s.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5207,12 -4132,10 +5223,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Ez így helyes (i/n)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5223,7 -4146,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5240,50 -4162,39 +5256,50 @@@ msgstr "
  "    \"Heinrich Heine (a költő) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Teljes név: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Érvénytelen karakter a névben!\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "A név legalább 5 karakter kell legyen!\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-mail cím: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Ez nem érvényes e-mail cím.\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Megjegyzés: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Érvénytelen karakter a megjegyzésben!\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5294,7 -4205,6 +5310,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5309,37 -4219,30 +5325,37 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnMmEeRrKk"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Kérem, előbb javítsa ki a hibát!\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5351,13 -4254,10 +5367,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5365,68 -4265,55 +5381,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" már tömörített.\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Kulcs létrehozása megszakítva.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5436,37 -4323,31 +5452,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, 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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Valóban létrehozzam? "
@@@ -5549,26 -4414,22 +5565,26 @@@ msgstr " Kulcs ujjlenyomata =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "Ellenőrzöm a(z) \"%s\" kulcskarikát.\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
  msgstr[1] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5576,7 -4437,6 +5592,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 rossz aláírás.\n"
  msgstr[1] "1 rossz aláírás.\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: Kulcskarikát létrehoztam.\n"
@@@ -5882,7 -4680,6 +5898,7 @@@ msgstr "Bináris
  msgid "textmode"
  msgstr "Szövegmódú"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "Ismeretlen módú"
  
@@@ -6102,57 -4857,46 +6118,57 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Írja be a jelszót!\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "A felhasználó megszakította a műveletet.\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr ""
  " \n"
  "  (fő kulcsazonosító: %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6586,17 -5247,14 +6602,17 @@@ msgstr "A DEK régi kódolása nem tám
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "A %d%s rejtjelező algoritmus ismeretlen vagy tiltott.\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "MEGJEGYZÉS: %d rejtjelező algoritmus nincs a preferenciák között.\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6890,7 -5499,6 +6906,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s aláírás a következőtől: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6898,11 -5506,9 +6914,11 @@@ msgstr "
  "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
  "a címzett preferenciáival.\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "Aláírom:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s titkosítást fogok használni.\n"
@@@ -6967,17 -5562,14 +6983,17 @@@ msgstr "Hiba: Érvénytelen ujjlenyomat
  msgid "ownertrust value missing"
  msgstr "bizalmi értékek importja"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "Hiba bizalmi rekord keresésekor: %s.\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "Olvasási hiba: %s.\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
@@@ -7011,7 -5597,6 +7027,7 @@@ msgstr "Bizalmi adatbázis tranzakciój
  msgid "%s: directory does not exist!\n"
  msgstr "%s: Könyvtár nem létezik!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
@@@ -7154,10 -5711,6 +7170,10 @@@ msgstr "Hiba a jelszó létrehozásakor
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7189,7 -5737,6 +7205,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7361,11 -5881,9 +7377,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7374,121 -5891,101 +7390,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Töröltem %d aláírást.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "%lu jelszóval rejtjelezve\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Eljárásmód: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7505,18 -6002,14 +7521,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7567,56 -6051,45 +7583,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  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:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, 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:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7624,22 -6097,18 +7640,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7753,19 -6201,14 +7769,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7814,7 -6248,6 +7830,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -7829,69 -6260,67 +7845,84 @@@ msgstr "Bizalmi adatbázis (%s) inicial
  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:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7900,27 -6329,22 +7931,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "jelszóváltoztatás"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "jelszóváltoztatás"
+ 
++#: scd/app-openpgp.c:2619
  #, 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:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7928,117 -6352,93 +7959,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "\"%s\" már tömörített.\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "nem támogatott URI"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@@ -8059,57 -6456,45 +8090,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "ne használja a terminált egyáltalán"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8119,22 -6503,14 +8150,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@@ -8153,12 -6526,10 +8179,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8171,12 -6540,10 +8197,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "Írom a titkos kulcsot a %s állományba.\n"
@@@ -8204,9 -6566,6 +8230,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8229,12 -6584,10 +8255,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8247,7 -6598,6 +8273,7 @@@ msgstr "Írom a titkos kulcsot a %s ál
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Ez a kulcs lejárt!"
@@@ -8303,7 -6642,6 +8329,7 @@@ msgstr "rossz igazolás
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "megmutatja az ujjlenyomatot"
@@@ -8333,7 -6665,6 +8359,7 @@@ msgstr "visszavonási igazolás készí
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8342,29 -6672,23 +8368,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "aláírás ellenőrzése"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
@@@ -8393,11 -6712,9 +8419,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "nem"
@@@ -8434,36 -6746,28 +8460,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8557,72 -6843,58 +8583,72 @@@ msgstr "Hiba a(z) \"%s\" kulcskarika l�
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (csak aláírás)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "kulcs tiltása"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (aláírás és titkosítás)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Nincs leírás.)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
@@@ -8632,81 -6904,64 +8658,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "E-mail cím: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Adja meg a felhasználói azonosítót! Üres sorral fejezze be: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Írja be az új állománynevet"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8848,7 -7072,6 +8874,7 @@@ msgstr "kulcskarika hozzáadása a kulc
  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:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
@@@ -8936,17 -7143,14 +8962,17 @@@ msgstr "visszavonási igazolás készí
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -9010,7 -7203,6 +9036,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9024,168 -7215,138 +9050,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "%d%s védő algoritmus nem támogatott.\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Az aláírás lejárt: %s.\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Jó aláírás a következőtől: \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "               azaz \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Ez egy önaláírás lesz.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "rossz igazolás"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "visszavonási igazolás készítése"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@@ -9222,7 -7377,6 +9253,7 @@@ msgstr "A kulcsblokk törlése sikertel
  msgid "not removing file '%s'\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -9446,7 -7556,6 +9477,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9463,12 -7570,10 +9494,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "Érvénytelen válasz az ügynöktől!\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@@ -9518,148 -7614,119 +9549,148 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "Aláírás-ellenőrzés elnyomva.\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "Írok a \"%s\" állományba.\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "Frissítés sikertelen: %s.\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@@ -9668,50 -7734,38 +9699,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "\"%s\" kulcs nem található: %s\n"
@@@ -9864,116 -7889,88 +9895,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Kilépjek mentés nélkül? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9986,91 -7983,72 +10017,91 @@@ msgstr "
  "@\n"
  "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "Használat: gpg [opciók] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "Olvasási hiba: %s.\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "nem feldolgozott"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10310,38 -8240,31 +10341,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: Érvénytelen állományverzió (%d).\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10374,255 -8291,199 +10405,251 @@@ msgstr "Hiba \"%s\" olvasásakor: %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "visszavonási igazolás készítése"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: Nem tudom elérni: %s.\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "%s rejtjelezést használok.\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "Aláírás sikertelen: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "Aláírás sikertelen: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "Aláírás sikertelen: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "aláírás ellenőrzése"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10719,193 -8559,146 +10746,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|N. sorszámú jelszómód használata"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NÉV|titkosítás NÉV részére"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "hálózati hiba"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "rossz jelszó"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "nyilvános kulcs nem található"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "Hiba \"%s\" olvasásakor: %s\n"
diff --cc po/id.po
index cfaebfc,04bac61..211d504
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -20,7 -19,6 +20,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.3\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -31,40 -29,31 +31,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "passphrase tidak valid
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -82,75 -70,59 +82,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "passphrase yang buruk"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "baris terlalu panjang\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "passphrase terlalu panjang\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Karakter tidak valid dalam nama\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI yang buruk"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "passphrase yang buruk"
@@@ -160,150 -131,115 +160,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "tidak dapat membuka `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "kesalahan penciptaan passphrase: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "ubah passphrase"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Ulangi passphrase: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Ulangi passphrase: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Ulangi passphrase: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "passphrase tidak diulang dengan benar; coba lagi"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "passphrase tidak diulang dengan benar; coba lagi"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "passphrase tidak diulang dengan benar; coba lagi"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -388,48 -310,33 +395,48 @@@ msgstr "
  "Pilihan:\n"
  "  "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Kunci dilampaui"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -514,11 -404,6 +521,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -534,47 -417,34 +541,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -584,28 -453,22 +591,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
@@@ -633,7 -490,6 +640,7 @@@ msgstr "trustdb: read failed (n=%d): %s
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: tidak dapat membuat direktori: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -658,12 -510,10 +665,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "gagal perbarui rahasia: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: dilewati: %s\n"
@@@ -685,8 -531,6 +692,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -538,6 +701,9 @@@ msgstr "
  "@Perintah:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -750,8 -583,6 +757,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -810,8 -632,6 +817,8 @@@ msgstr "
  msgid "Yes"
  msgstr "y|ya"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -862,19 -675,16 +869,19 @@@ msgstr "ubah passphrase
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "aktifkan kunci"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -894,7 -701,6 +901,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@@ -921,22 -723,14 +928,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -951,8 -743,6 +958,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -962,12 -751,10 +969,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@@ -1194,8 -935,6 +1201,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1331,7 -1043,10 +1338,12 @@@ msgstr "kesalahan dalam garis trailer\n
  msgid "[none]"
  msgstr "tidak dikenal"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "karakter radix64 tidak valid %02x dilewati\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "menulis kunci rahasia ke `%s'\n"
@@@ -1407,7 -1108,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "tidak diproses"
@@@ -1466,8 -1155,6 +1478,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1636,8 -1290,6 +1648,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1298,10 +1659,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Pilihan anda? "
  
@@@ -1722,17 -1354,11 +1734,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1799,7 -1412,6 +1811,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@@ -1830,13 -1437,10 +1842,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "dibulatkan hingga %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1485,6 +1903,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Pilihan tidak valid.\n"
  
@@@ -2028,23 -1590,15 +2040,23 @@@ msgstr "Perintah tidak valid (coba \"he
  msgid "--output doesn't work for this command\n"
  msgstr "--output tidak berfungsi untuk perintah ini\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1648,6 +2118,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -2144,7 -1679,6 +2156,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2272,40 -1782,31 +2284,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: dilewati: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "menulis ke `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "PERINGATAN: tidak ada yang diekspor\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2586,7 -2026,6 +2598,7 @@@ msgstr "|N|set tingkat kompresi N (0 ti
  msgid "use canonical text mode"
  msgstr "gunakan mode teks kanonikal"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
@@@ -2767,475 -2178,377 +2779,479 @@@ msgstr "Peringatan: permisi direktori t
  msgid "unknown configuration item '%s'\n"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "tampilkan keyring tempat kunci yang dipilih berada"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "tidak dapat menset path exec ke %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "PERINGATAN: program mungkin membuat file core!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "PERINGATAN: %s menimpa %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s tidak dibolehkan dengan %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s tidak masuk akal dengan %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed harus lebih dari 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed harus lebih dari 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferensi baku tidak valid\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferensi cipher personal tidak valid\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferensi digest personal tidak valid\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferensi kompresi personal tidak valid\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s belum dapat dipakai dengan %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "dekripsi gagal: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Penerimaan keyserver gagal: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Ekspor kunci gagal: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Pencarian keyserver gagal: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh keyserver gagal: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "gagal dearmoring: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Teruskan dan ketikkan pesan anda ....\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "mengambil kunci ini dari keyring"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "buat timestamp konflik hanya sebagai peringatan"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tulis info status ke FD ini"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4584,15 -3632,10 +4600,15 @@@ msgstr "
  "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
  "kecuali anda memulai kembali program.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[revoked] "
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4633,7 -3670,6 +4649,7 @@@ msgstr "Anda tetap ingin menambahkannya
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4665,7 -3695,6 +4681,7 @@@ msgstr[1] "Menghapus %d signature.\n
  msgid "Nothing deleted.\n"
  msgstr "Tidak ada yang dihapus.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "armor tidak valid"
@@@ -4912,74 -3893,58 +4928,74 @@@ msgstr "User ID \"%s\" telah dibatalkan
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Karakter tidak valid dalam string preferensi\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "menulis signature direct\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "menulis self signature\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "menulis key binding signature\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "keysize tidak valid; menggunakan %u bit\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "keysize dibulatkan hingga %u bit\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "tandai"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "enkripsi data"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -4993,157 -3958,126 +5009,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "  (%d) RSA (hanya menandai)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notasi signature: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Keysize yang diminta adalah %u bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5159,7 -4093,6 +5175,7 @@@ msgstr "
  "     <n>m = kunci berakhir dalam n bulan\n"
  "     <n>y = kunci berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5175,40 -4108,32 +5191,40 @@@ msgstr "
  "     <n>m = signature berakhir dalam n bulan\n"
  "     <n>y = signature berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Kunci valid untuk? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signature valid untuk? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "nilai yang tidak valid\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s berakhir pada %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signature kadaluarsa pada %s \n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5216,12 -4141,10 +5232,12 @@@ msgstr "
  "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
  "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Benar (y/t)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5232,7 -4155,6 +5248,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5248,50 -4170,39 +5264,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:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nama sebenarnya: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Karakter tidak valid dalam nama\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Nama tidak boleh dimulai dengan digit\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nama harus berukuran minimum 5 karakter\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Alamat email: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Komentar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Karakter tidak valid dalam komentar\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5301,7 -4212,6 +5317,7 @@@ msgstr "
  "Anda memilih USER-ID ini:\n"
  "   \"%s\"\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5316,35 -4226,28 +5332,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Silakan perbaiki kesalahan ini dulu\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5356,13 -4259,10 +5372,13 @@@ msgstr "
  "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
  "yang baik untuk memperoleh entropi.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5370,68 -4270,55 +5386,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Pembuatan kunci dibatalkan.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5441,36 -4328,30 +5457,36 @@@ msgstr "
  "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
  "untuk tujuan ini.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, 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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Ingin diciptakan? "
@@@ -5553,26 -4418,22 +5569,26 @@@ msgstr "     Fingerprint kunci =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "memeriksa keyring `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu kunci telah diperiksa (%lu signature)\n"
  msgstr[1] "%lu kunci telah diperiksa (%lu signature)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5580,7 -4441,6 +5596,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 signature yang buruk\n"
  msgstr[1] "1 signature yang buruk\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: keyring tercipta\n"
@@@ -5881,7 -4679,6 +5897,7 @@@ msgstr "biner
  msgid "textmode"
  msgstr "modeteks"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "tidak dikenal"
  
@@@ -6096,55 -4851,44 +6112,55 @@@ msgstr "PERINGATAN: kunci sesi mungkin 
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "subpaket tipe %d memiliki bit kritis terset\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Masukkan passphrase\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "dibatalkan oleh user\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (ID kunci utama %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6578,17 -5239,14 +6594,17 @@@ msgstr "encoding lama DEK tidak didukun
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6884,17 -5493,14 +6900,17 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s signature dari: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "menandai:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s enkripsi akan digunakan\n"
@@@ -6959,17 -5554,14 +6975,17 @@@ msgstr "kesalahan: fingerprint tidak va
  msgid "ownertrust value missing"
  msgstr "impor nilai ownertrust"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: gagal sync: %s\n"
@@@ -7003,7 -5589,6 +7019,7 @@@ msgstr "transaksi trustdb terlalu besar
  msgid "%s: directory does not exist!\n"
  msgstr "%s: direktori tidak ada!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "tidak dapat menutup `%s': %s\n"
@@@ -7146,10 -5703,6 +7162,10 @@@ msgstr "kesalahan penciptaan passphrase
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7181,7 -5729,6 +7197,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7353,11 -5873,9 +7369,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7366,121 -5883,101 +7382,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Menghapus %d signature.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "dienkripsi dengan passphrase %lu\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Kebijakan: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7497,18 -5994,14 +7513,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7558,56 -6042,45 +7574,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "pemeriksaan trustdb berikutnya pada %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "kunci publik %08lX tidak ditemukan: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "lakukanlah --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "memeriksa trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7615,22 -6088,18 +7631,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7744,19 -6192,14 +7760,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7805,7 -6239,6 +7821,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -7820,69 -6251,67 +7836,84 @@@ msgstr "gagal inisialisasi TrustDB: %s\
  msgid "failed to store the creation date: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7891,27 -6320,22 +7922,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "ubah passphrase"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "ubah passphrase"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7919,117 -6343,93 +7950,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "gagal membaca keyblock: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: kesalahan membaca record bebas: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI tidak didukung"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@@ -8050,57 -6447,45 +8081,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "jangan menggunakan terminal"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "perintah saling konflik\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8110,22 -6494,14 +8141,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "karakter radix64 tidak valid %02x dilewati\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -8144,12 -6517,10 +8170,12 @@@ msgstr "
  msgid "shell"
  msgstr "bantuan"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "protokol gpg-agent versi %d tidak didukung\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8162,12 -6531,10 +8188,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "tidak dapat membuka `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "menulis kunci rahasia ke `%s'\n"
@@@ -8195,9 -6557,6 +8221,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8220,12 -6575,10 +8246,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8238,7 -6589,6 +8264,7 @@@ msgstr "menulis kunci rahasia ke `%s'\n
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Kunci ini telah berakhir!"
@@@ -8294,7 -6633,6 +8320,7 @@@ msgstr "sertifikat yang buruk
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "tampilkan fingerprint"
@@@ -8324,7 -6656,6 +8350,7 @@@ msgstr "buat sertifikat revokasi
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8333,29 -6663,23 +8359,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifikasi signature"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "preferensi %c%lu ganda \n"
@@@ -8384,11 -6703,9 +8410,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "n|t|tidak"
@@@ -8424,36 -6736,28 +8450,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bit %s key, ID %08lX, tercipta %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8547,72 -6833,58 +8573,72 @@@ msgstr "kesalahan menulis keyring `%s'
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "  (%d) RSA (hanya menandai)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: kesalahan membaca record bebas: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "tiadakan kunci"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (tandai dan enkripsi)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Tidak diberikan deskripsi)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
@@@ -8622,82 -6894,65 +8648,82 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Alamat email: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Masukkan user ID.  Akhiri dengan baris kosong: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Masukkan nama file baru"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr ""
  "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Buat sertifikat pembatalan untuk kunci ini?"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8839,7 -7063,6 +8865,7 @@@ msgstr "tambah keyring ini ke daftar ke
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
@@@ -8927,17 -7134,14 +8953,17 @@@ msgstr "buat sertifikat revokasi
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -9001,7 -7194,6 +9027,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9015,168 -7206,138 +9041,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "algoritma proteksi %d%s tidak didukung\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Signature kadaluwarsa %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Signature baik dari \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "              alias \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Ini akan jadi self-signature.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "tampilkan fingerprint"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "sertifikat yang buruk"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "kesalahan penciptaan passphrase: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "buat sertifikat revokasi"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -9213,7 -7368,6 +9244,7 @@@ msgstr "gagal menghapus keyblok: %s\n
  msgid "not removing file '%s'\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -9437,7 -7547,6 +9468,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9454,12 -7561,10 +9485,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "respon tidak valid dari agen\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "tidak dapat membuka file: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
@@@ -9509,148 -7605,119 +9540,148 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verifikasi signature tidak diabaikan\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "tidak dapat membuat direktori `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "tidak dapat membuat direktori `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "gagal perbarui rahasia: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "menulis ke `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: kesalahan membaca record bebas: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? masalah memeriksa pembatalan: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
@@@ -9659,50 -7725,38 +9690,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: kesalahan menulis dir record: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "kesalahan penciptaan : `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
@@@ -9855,116 -7880,88 +9886,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Berhenti tanpa menyimpan? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9977,91 -7974,72 +10008,91 @@@ msgstr "
  "@\n"
  "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "pemakaian: gpg [pilihan] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "tidak diproses"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10301,38 -8231,31 +10332,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "mencari \"%s\" dari server HKP %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versi file %d tidak valid\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "tidak dapat membuka file: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "gagal perbarui rahasia: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10365,255 -8282,199 +10396,251 @@@ msgstr "kesalahan membaca `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "buat sertifikat revokasi"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: tidak dapat mengakses: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "tidak ada keyring rahasia baku: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "menggunakan cipher %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "CATATAN: kunci telah dibatalkan"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "memeriksa trustdb\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verifikasi signature"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10710,193 -8550,146 +10737,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|gunakan passphrase mode N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAMA|enkripsi untuk NAMA"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "kesalahan jaringan"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "passphrase yang buruk"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "kunci publik tidak ditemukan"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "kesalahan membaca `%s': %s\n"
diff --cc po/it.po
index c648fc5,e9f9394..dd324c1
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -15,7 -14,6 +15,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -26,40 -24,31 +26,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "passphrase non valida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -77,75 -65,59 +77,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "passphrase errata"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "riga troppo lunga\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "passphrase troppo lunga\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Carattere non valido nel nome\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI danneggiato"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "passphrase errata"
@@@ -155,150 -126,115 +155,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "impossibile aprire `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "errore nella creazione della passhprase: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "cambia la passphrase"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Ripeti la passphrase: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Ripeti la passphrase: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Ripeti la passphrase: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "passphrase non ripetuta correttamente; prova ancora"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "passphrase non ripetuta correttamente; prova ancora"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "passphrase non ripetuta correttamente; prova ancora"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -383,48 -305,33 +390,48 @@@ msgstr "
  "Opzioni:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Questa chiave è stata sostituita"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -509,11 -399,6 +516,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -529,47 -412,34 +536,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossibile creare %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -579,28 -448,22 +586,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -628,7 -485,6 +635,7 @@@ msgstr "trustdb: read fallita (n=%d): %
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: impossibile creare la directory: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -653,12 -505,10 +660,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aggiornamento della chiave segreta fallito: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: saltata: %s\n"
@@@ -680,8 -526,6 +687,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -689,9 -533,6 +696,9 @@@ msgstr "
  "@Comandi:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -745,8 -578,6 +752,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -805,8 -627,6 +812,8 @@@ msgstr "
  msgid "Yes"
  msgstr "si|sì"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -857,19 -670,16 +864,19 @@@ msgstr "cambia la passphrase
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "abilita una chiave"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -889,7 -696,6 +896,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
@@@ -916,22 -718,14 +923,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -946,8 -738,6 +953,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "errore leggendo `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -957,12 -746,10 +964,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@@ -1189,8 -930,6 +1196,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1326,7 -1038,10 +1333,12 @@@ msgstr "errore nella riga della coda\n
  msgid "[none]"
  msgstr "sconosciuto"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "Carattere radix64 non valido %02x saltato\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -1404,7 -1105,6 +1416,7 @@@ msgid "command \"%.50s\" is ambiguous\n
  msgstr ""
  
  # ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "non esaminato"
@@@ -1463,8 -1152,6 +1475,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1633,8 -1287,6 +1645,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1295,10 +1656,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Cosa scegli? "
  
@@@ -1720,17 -1352,11 +1732,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -1797,7 -1410,6 +1809,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@@ -1828,13 -1435,10 +1840,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrotondate a %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1889,9 -1483,6 +1901,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Scelta non valida.\n"
  
@@@ -2026,23 -1588,15 +2038,23 @@@ msgstr "Comando non valido  (prova \"he
  msgid "--output doesn't work for this command\n"
  msgstr "--output non funziona con questo comando\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1646,6 +2116,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -2145,7 -1680,6 +2157,7 @@@ msgstr "
  "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
  "del destinatario\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2279,40 -1789,31 +2291,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: saltata: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "scrittura in `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "ATTENZIONE: non è stato esportato nulla\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2593,7 -2033,6 +2605,7 @@@ msgstr "|N|imposta il livello di compre
  msgid "use canonical text mode"
  msgstr "usa il modo testo canonico"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
@@@ -2774,474 -2185,376 +2786,478 @@@ msgstr "ATTENZIONE: i permessi \"%s\" d
  msgid "unknown configuration item '%s'\n"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "impossibile impostare exec-path a %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Non è permesso usare %s con %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "Non ha senso usare %s con %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "l'algoritmo di digest selezionato non è valido\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve essere maggiore di 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve essere maggiore di 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferenze predefinite non valide\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferenze personali del cifrario non valide\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferenze personali del digest non valide\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferenze personali di compressione non valide\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s non funziona ancora con %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifratura fallita: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "ricezione dal keyserver fallita: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "esportazione della chiave fallita: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ricerca nel keyserver fallita: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "aggiornamento del keyserver fallito: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "rimozione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Vai avanti e scrivi il messaggio...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "l'URL della politica di certificazione indicato non è valido\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "prende le chiavi da questo portachiavi"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "segnala i conflitti di data solo con un avvertimento"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|scrivi le informazioni di stato sul FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4592,15 -3640,10 +4608,15 @@@ msgstr "
  "corretta\n"
  "finchè non eseguirai di nuovo il programma.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[revocata]"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4642,7 -3679,6 +4658,7 @@@ msgid "You may not add a photo ID to a 
  msgstr ""
  "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4674,7 -3704,6 +4690,7 @@@ msgstr[1] "Cancellata %d firma.\n
  msgid "Nothing deleted.\n"
  msgstr "Non è stato cancellato nulla.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "armatura non valida"
@@@ -4927,74 -3908,58 +4943,74 @@@ msgid "Displaying %s photo ID of size %
  msgstr ""
  "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "carattere non valido nella stringa delle preferenze\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "scrittura della firma diretta\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "scrittura della autofirma\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "scrittura della firma di collegamento alla chiave\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "dimensione della chiave non valida; uso %u bit\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "dimensioni della chiave arrotondate a %u bit\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifra dati"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5008,157 -3973,126 +5024,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (firma solo)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Annotazione della firma: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La dimensione richiesta della chiave è %u bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5174,7 -4108,6 +5190,7 @@@ msgstr "
  "      <n>m = la chiave scadrà dopo n mesi\n"
  "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5190,40 -4123,32 +5206,40 @@@ msgstr "
  "      <n>m = la chiave scadrà dopo n mesi\n"
  "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Chiave valida per? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Firma valida per? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valore non valido\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s scadrà il %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Questa firma scadrà il %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5231,12 -4156,10 +5247,12 @@@ msgstr "
  "Il tuo sistema non può mostrare date oltre il 2038.\n"
  "Comunque, sarà gestita correttamente fino al 2106.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "È giusto (s/n)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5247,7 -4170,6 +5263,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5264,50 -4186,39 +5280,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nome e Cognome: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Carattere non valido nel nome\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Il nome non può iniziare con una cifra\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Indirizzo di Email: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Commento: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Carattere non valido nel commento\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5318,7 -4229,6 +5334,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5333,35 -4243,28 +5349,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Per favore correggi prima l'errore\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5373,13 -4276,10 +5389,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5387,66 -4287,53 +5403,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' è già compresso\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Uso lo stesso questa chiave? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Generazione della chiave annullata.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: chiave %08lX scaduta il %s\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "chiavi pubbliche e segrete create e firmate.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5456,7 -4343,6 +5472,7 @@@ msgstr "
  "il comando \"--edit-key\" per generare una chiave secondaria per questo "
  "scopo.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5464,7 -4350,6 +5480,7 @@@ msgstr "
  "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5472,22 -4357,18 +5488,22 @@@ msgstr "
  "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crea davvero? "
@@@ -5570,26 -4435,22 +5586,26 @@@ msgstr "     Impronta digitale =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "controllo il portachiavi `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "Sono state controllate %lu chiavi (%lu firme)\n"
  msgstr[1] "Sono state controllate %lu chiavi (%lu firme)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5597,7 -4458,6 +5613,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "una firma non corretta\n"
  msgstr[1] "una firma non corretta\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: portachiavi creato\n"
@@@ -5899,7 -4697,6 +5915,7 @@@ msgstr "binario
  msgid "textmode"
  msgstr "modo testo"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "sconosciuto"
  
@@@ -6119,55 -4874,44 +6135,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema con l'agent: ha restituito 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Inserisci la passphrase\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "interrotto dall'utente\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (key ID principale %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6605,18 -5266,15 +6621,18 @@@ msgstr "la vecchia codifica del DEK no
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "l'algoritmo di cifratura %d%s è sconosciuto o disattivato\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: chiave %08lX scaduta il %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6924,18 -5533,15 +6940,18 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "Firma %s da: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "firma:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "sarà usato il cifrario %s\n"
@@@ -7000,17 -5595,14 +7016,17 @@@ msgstr "errore: impronta digitale non v
  msgid "ownertrust value missing"
  msgstr "importa i valori di fiducia"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "errore cercando il record della fiducia: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync fallita: %s\n"
@@@ -7044,7 -5630,6 +7060,7 @@@ msgstr "transazione del trustdb troppo 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: la directory non esiste!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "impossibile chiudere `%s': %s\n"
@@@ -7187,10 -5744,6 +7203,10 @@@ msgstr "errore nella creazione della pa
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -7222,7 -5770,6 +7238,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -7394,11 -5914,9 +7410,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7407,121 -5924,101 +7423,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Cancellate %d firme.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "cifratto con %lu passphrase\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Policy: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7538,18 -6035,14 +7554,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7600,56 -6084,45 +7616,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "chiave pubblica %08lX non trovata: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "per favore usa --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "controllo il trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7657,22 -6130,18 +7673,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7786,19 -6234,14 +7802,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7847,7 -6281,6 +7863,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -7862,69 -6293,67 +7878,84 @@@ msgstr "inizializzazione del trustdb fa
  msgid "failed to store the creation date: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7933,27 -6362,22 +7964,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "cambia la passphrase"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "cambia la passphrase"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7961,117 -6385,93 +7992,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "errore leggendo il keyblock: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: errore durante la lettura del record libero: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' è già compresso\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non gestito"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@@ -8092,57 -6489,45 +8123,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOME|usa NOME come destinatario predefinito"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOME|usa NOME come destinatario predefinito"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "non usa per niente il terminale"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "comandi in conflitto\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8152,22 -6536,14 +8183,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "Carattere radix64 non valido %02x saltato\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent non è disponibile in questa sessione\n"
@@@ -8186,12 -6559,10 +8212,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8204,12 -6573,10 +8230,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "impossibile aprire `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -8237,9 -6599,6 +8263,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8262,12 -6617,10 +8288,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8280,7 -6631,6 +8306,7 @@@ msgstr "scrittura della chiave segreta 
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Questa chiave è scaduta!"
@@@ -8336,7 -6675,6 +8362,7 @@@ msgstr "certificato danneggiato
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "mostra le impronte digitali"
@@@ -8366,7 -6698,6 +8392,7 @@@ msgstr "genera un certificato di revoca
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8375,29 -6705,23 +8401,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifica una firma"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "la preferenza %c%lu è doppia\n"
@@@ -8426,11 -6745,9 +8452,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "no"
@@@ -8466,36 -6778,28 +8492,36 @@@ msgstr "
  "\"%.*s\"\n"
  "%u-bit %s key, ID %08lX, created %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8589,72 -6875,58 +8615,72 @@@ msgstr "errore creando il portachiavi `
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (firma solo)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: errore durante la lettura del record libero: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "disabilita una chiave"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (firma e cifra)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Non è stata data una descrizione)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
@@@ -8664,81 -6936,64 +8690,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Indirizzo di Email: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Inserisci l'user ID. Termina con una riga vuota: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Inserire il nuovo nome del file"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Creare un certificato di revoca per questa chiave? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Certificato di revoca creato.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8880,7 -7104,6 +8906,7 @@@ msgstr "aggiungi questo portachiavi all
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|cerca le chiavi in questo keyserver"
@@@ -8968,17 -7175,14 +8994,17 @@@ msgstr "genera un certificato di revoca
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -9042,7 -7235,6 +9068,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9056,168 -7247,138 +9082,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Firma scaduta il %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Firma valida da \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                alias \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Questa sarà una autofirma.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Certificato di revoca creato.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "mostra le impronte digitali"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificato danneggiato"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "errore nella creazione della passhprase: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Certificato di revoca creato.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "genera un certificato di revoca"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -9254,7 -7409,6 +9285,7 @@@ msgstr "cancellazione del keyblock fall
  msgid "not removing file '%s'\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -9479,7 -7589,6 +9510,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9496,12 -7603,10 +9527,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "risposta non valida dall'agent\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "impossibile aprire il file: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -9551,149 -7647,120 +9582,149 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verifica della firma soppressa\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "impossibile creare la directory `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "impossibile creare la directory `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "aggiornamento della chiave segreta fallito: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "scrittura in `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
  "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: errore durante la lettura del record libero: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? problema controllando la revoca: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -9702,50 -7768,38 +9733,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: errore durante la scrittura del dir record: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "errore creando `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "chiave `%s' non trovata: %s\n"
@@@ -9898,116 -7923,88 +9929,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Esco senza salvare? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10020,92 -8017,73 +10051,92 @@@ msgstr "
  "@\n"
  "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opzioni] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
  # ??? (Md)
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non esaminato"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10345,38 -8275,31 +10376,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "cerco \"%s\" sul server HKP %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versione %d del file non valida\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "impossibile aprire il file: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "aggiornamento della chiave segreta fallito: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10409,255 -8326,199 +10440,251 @@@ msgstr "errore leggendo `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "genera un certificato di revoca"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: impossibile acedere a: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "nessun portachiavi segreto predefinito: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "uso il cifrario %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "NOTA: la chiave è stata revocata"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "controllo il trustdb\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verifica una firma"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "la preferenza %c%lu è doppia\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10754,193 -8594,146 +10781,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|usa il modo N per la passphrase"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifra per NOME"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, 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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "errore di rete"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "passphrase errata"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "chiave pubblica non trovata"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "errore leggendo `%s': %s\n"
diff --cc po/ja.po
index 43080e8,c8a21d3..13a8cb5
--- a/po/ja.po
+++ b/po/ja.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.1.16\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -20,7 -19,6 +20,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=1; plural=0;\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "pinentryのロックの獲得に失敗しました: %s\n"
@@@ -31,45 -29,35 +31,45 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|キャンセル(_C)"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Yes"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_No"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|パスワードマネージャに保管(_S)"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "本当に画面にパスフレーズを見えるようにしますか?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|パスフレーズを見えるようにする"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|パスフレーズを隠す"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "品質:"
  
@@@ -79,11 -67,9 +79,11 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr "pinentry.qualitybar.tooltip"
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -91,7 -77,6 +91,7 @@@ msgstr "
  "あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
  "使われます)"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -99,53 -84,40 +99,53 @@@ msgstr "
  "あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
  "るために使われます)"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "パスフレーズ:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "一致しません - もう一度"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (現在 %d / 最大 %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "繰り返し:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PINが長すぎます"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "パスフレーズが長すぎます"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "PINに無効な文字があります"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PINが短すぎます"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "不正なPINです"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "パスフレーズが不正です"
  
@@@ -154,49 -125,35 +154,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "カード・シリアル番号の取得エラー: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "カードを検出しました。シリアル番号: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "カードにsshの認証鍵がありません: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "適当なカードの鍵が見つかりません: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "保存されたフラグの取得エラー: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -205,24 -162,19 +213,24 @@@ msgstr "
  "sshプロセスが以下の鍵の使用を要求しました:%%0A  %s%%0A  (%s)%%0Aこの使用を認"
  "めますか?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "許可する"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "拒否する"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "以下のssh鍵に対するパスフレーズを入力してください:%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "このパスフレーズをもう一度入力してください"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -231,68 -183,53 +239,68 @@@ msgstr "
  "パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A   %s"
  "%%0A   %s%%0Aを保護します。"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "以下のシリアル番号のカードを挿入してください"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "管理者PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "リセット・コード"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0Aリーダーのピンパッドを入力に使ってください。"
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "このリセット・コードをもう一度入力してください"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "このPUKをもう一度入力してください"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "このPINをもう一度入力してください"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "リセット・コードが正しく繰り返されていません。もう一度"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUKが正しく繰り返されていません。もう一度"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PINが正しく繰り返されていません。もう一度"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "カードのロックを解除するためにPIN%s%s%sを入力してください"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "一時ファイルの作成エラー: %s\n"
@@@ -372,45 -295,30 +380,45 @@@ msgstr "
  "@オプション:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "デーモン・モードで実行 (バックグラウンド)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "サーバ・モードで実行 (フォアグラウンド)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  msgid "run in supervised mode"
  msgstr "スーパーバイズド・モードで実行"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "いくらかおとなしく"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sh-形式のコマンド出力"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "csh-形式のコマンド出力"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "コンソールからデタッチしない"
  
@@@ -485,11 -376,6 +493,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "バグは <@EMAIL@> までご報告ください。\n"
  
@@@ -505,43 -389,30 +513,43 @@@ msgstr "
  "形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の秘密鍵の管理\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "無効なdebug-level '%s'が与えられました\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "オプション・ファイル '%s': %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "'%s' からオプションを読み込みます\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "*注意*: '%s'はオプションとは考えられません\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "ソケットが作成できません: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "ソケット名'%s'は長すぎます\n"
@@@ -550,27 -420,21 +558,27 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "ソケットのナンス取得エラー\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "'%s'でソケットのバインドのエラー: %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "'%s'の許可が設定できません: %s\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() に失敗しました: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "ソケット'%s'でlisten\n"
@@@ -597,7 -455,6 +605,7 @@@ msgstr "'%s'でstat()が失敗しまし
  msgid "can't use '%s' as home directory\n"
  msgstr "'%s'をホーム・ディレクトリに使えません\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %dでナンスの読み込みエラー: %s\n"
@@@ -622,12 -475,10 +630,12 @@@ msgstr "ssh ハンドラ0x%lx (fd %d �
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 停止しました\n"
@@@ -649,8 -496,6 +657,8 @@@ msgstr "
  "形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
  "パスワードキャッシュの管理\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -658,9 -503,6 +666,9 @@@ msgstr "
  "@コマンド:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -716,8 -550,6 +724,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "'%s'を開く際、エラー: %s\n"
@@@ -775,8 -598,6 +783,8 @@@ msgstr "究極的にこれを信用し%
  msgid "Yes"
  msgstr "はい"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "いいえ"
  
@@@ -830,18 -644,15 +838,18 @@@ msgstr "パスフレーズを変更す�
  msgid "I'll change it later"
  msgstr "後で変更する"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "本当にこの鍵: keygrip%%0A  %s%%0A  %%C%%0Aを削除しますか?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "鍵を削除する"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -863,7 -671,6 +871,7 @@@ msgstr "%s 鍵は安全でない(%uビ�
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zuビットのハッシュは%uビットの%s鍵には無効です\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "作成された署名の検査に失敗しました: %s\n"
@@@ -887,22 -690,14 +895,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "パイプの作成エラー: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "パイプのストリーム作成エラー: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "プロセスforkエラー: %s\n"
@@@ -917,8 -710,6 +925,8 @@@ msgstr "プロセス%dの終了待ち�
  msgid "error running '%s': probably not installed\n"
  msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "'%s'の実行エラー: exitステイタス %d\n"
@@@ -928,12 -718,10 +936,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "'%s'の実行エラー: 終了しました\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "プロセスの終了待ちが失敗: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "プロセス %d のexitコード取得エラー: %s\n"
@@@ -1148,8 -890,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "サポートされていないアルゴリズム: %s"
@@@ -1269,7 -982,10 +1277,12 @@@ msgstr "ガベージ行を無視しま�
  msgid "[none]"
  msgstr "[未設定]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "無効な64進文字%02Xをスキップしました\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "引数は期待されていません"
  
@@@ -1335,7 -1037,6 +1348,7 @@@ msgstr "オプション\"%.50s\"はあ�
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "コマンド\"%.50s\"はあいまいです\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "メモリがありません\n"
  
@@@ -1393,8 -1083,6 +1406,8 @@@ msgstr "lock '%s' は作成されませ
  msgid "waiting for lock %s...\n"
  msgstr "lock %s を待ちます...\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@@ -1548,8 -1203,6 +1561,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "これはバッチ・モードではできません\n"
  
@@@ -1557,14 -1209,9 +1570,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "あなたの選択は? "
  
@@@ -1626,16 -1259,10 +1639,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "'%s'の読み込みエラー: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "'%s'の書き込みエラー: %s\n"
@@@ -1695,7 -1309,6 +1708,7 @@@ msgstr "鍵は操作できません: %s
  msgid "not an OpenPGP card"
  msgstr "OpenPGPカードでありません"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "現行鍵情報の取得エラー: %s\n"
@@@ -1729,13 -1337,10 +1742,13 @@@ msgstr "暗号化鍵の鍵長は? (%u) 
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "認証鍵の鍵長は? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
@@@ -1789,9 -1384,6 +1802,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "無効な選択です。\n"
  
@@@ -1912,22 -1475,14 +1925,22 @@@ msgstr "無効なコマンド (\"help\"
  msgid "--output doesn't work for this command\n"
  msgstr "このコマンドで--outputは機能しません\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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"
@@@ -1984,7 -1527,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "パスフレーズの作成エラー: %s\n"
@@@ -2020,7 -1556,6 +2033,7 @@@ msgid "
  msgstr ""
  "*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2140,36 -1651,27 +2153,36 @@@ msgstr "エクスポートの際、で�
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " - スキップされました"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "'%s'への書き込み\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "秘密鍵のエクスポートは認められません\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "*警告*: 何もエクスポートされていません\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2424,7 -1865,6 +2437,7 @@@ msgstr "|N|圧縮レベルをNに設�
  msgid "use canonical text mode"
  msgstr "正準テキスト・モードを使用"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|出力をFILEに書き出す"
  
@@@ -2589,447 -2001,349 +2602,451 @@@ msgstr "*警告*: 拡張'%s'の安全�
  msgid "unknown configuration item '%s'\n"
  msgstr "不明のコンフィグレーション項目'%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "鍵の一覧時にフォトIDを表示する"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "署名の一覧時にポリシーURLを表示する"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "署名の一覧時にすべての注釈を表示する"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "署名の一覧時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "署名の一覧時にユーザの注釈を表示する"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "署名の一覧時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "鍵の一覧時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "鍵の一覧に鍵リングの名前を表示する"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "署名の一覧時に有効期限の日付を表示する"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, c-format
  msgid "valid values for option '%s':\n"
  msgstr "オプション'%s'に有効な値:\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "不明のTOFUポリシー'%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "オプション'%s'に無効な値です\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "*注意*: 普通%sは使いません!\n"
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s'は、有効な署名表現ではありません\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\"は正しいメール・アドレスではありません\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無効な pinentry mode '%s'です\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s'は、有効な文字集合ではありません\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "鍵サーバのURLを解析不能\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "無効なフィルタ・オプションです: %s\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無効な一覧オプションです\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "無効な一覧オプションです\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "署名の検証時にフォトIDを表示する"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "署名の検証時にポリシーURLを表示する"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "署名の検証時にすべての注釈を表示する"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "署名の検証時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "署名の検証時にユーザの注釈を表示する"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "署名の検証時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "署名の検証時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "署名の検証時に主なユーザIDだけをを表示する"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "PKAデータで署名を検証する"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "有効なPKAデータで署名の信用度を上昇させる"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無効な検証オプションです\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "無効な検証オプションです\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-pathを%sに設定不能\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "*警告*: %sは%sより優先\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%sは%sとともに使うことはできません!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%sは%sとともに使っても無意味です!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "%s のため、セキュアでないメモリで実行しません\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "選択された暗号アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "選択された圧縮アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-neededは正の値が必要です\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-neededは1より大きな値が必要です\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
  
- #: g10/gpg.c:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "無効なデフォルトの優先指定\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "無効な個人用暗号方式の優先指定\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "無効な個人用ダイジェストの優先指定\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "無効な個人用圧縮の優先指定\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%sは%sではまだ機能しません\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信用データベースの初期化に失敗しました: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "鍵サーバへの送信に失敗しました: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "鍵サーバからの受信に失敗しました: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "鍵のエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "鍵サーバの検索に失敗しました: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "鍵サーバの更新に失敗しました: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "外装除去に失敗しました: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "外装に失敗しました: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "鍵指定'%s'の構文解析エラー: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, 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:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "開始します。メッセージを打ってください ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "あたえられた証明書ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "あたえられた署名ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "指定された優先鍵サーバURLは無効です\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|鍵リングFILEの鍵を扱います"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "日時の矛盾を警告だけにします"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|このFDにステイタス情報を書き出す"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|ALGOで作成された署名を拒絶する"
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "使い方: gpgv [オプション] [ファイル] (ヘルプは -h)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4291,14 -3340,9 +4308,14 @@@ msgstr "
  "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
  "ということを念頭においてください。\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "失効"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "期限切れ"
  
@@@ -4336,7 -3374,6 +4353,7 @@@ msgstr "それでも追加したいで�
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
  
@@@ -4366,7 -3397,6 +4383,7 @@@ msgstr[0] "%d個の署名を削除し�
  msgid "Nothing deleted.\n"
  msgstr "何も削除していません。\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "無効"
  
@@@ -4594,71 -3576,55 +4611,71 @@@ msgstr "副鍵 %s は、もう失効さ
  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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "優先指定'%s'の重複\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "暗号方式の優先指定が多すぎます\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "ダイジェストの優先指定が多すぎます\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "圧縮の優先指定が多すぎます\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "優先指定の文字列に無効な項目'%s'があります\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "直接署名を書き込みます\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "自己署名を書き込みます\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "鍵対応への署名を書き込みます\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "無効な鍵長。%uビットにします\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "鍵長を%uビットに丸めます\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
  "きません\n"
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certify"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Encrypt"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Authenticate"
  
@@@ -4672,150 -3638,119 +4689,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "鍵%sに認められた操作: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "現在の認められた操作: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 署名機能を反転する\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 暗号機能を反転する\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 認証機能を反転する\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 完了\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "ご希望の鍵の種類を選択してください:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA と RSA (デフォルト)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA と Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (署名のみ)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (署名のみ)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (暗号化のみ)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (暗号化のみ)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC と ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (署名のみ)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (暗号化のみ)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) 既存の鍵\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "keygripを入力: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "このkeygripの鍵はありません\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "副鍵の鍵長は? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "鍵長は? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "要求された鍵長は%uビット\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "ご希望の楕円曲線を選択してください:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4831,7 -3766,6 +4848,7 @@@ msgstr "
  "      <n>m = 鍵は n か月間で期限切れ\n"
  "      <n>y = 鍵は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4847,38 -3781,30 +4864,38 @@@ msgstr "
  "      <n>m = 署名は n か月間で期限切れ\n"
  "      <n>y = 署名は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "鍵の有効期間は? (0)"
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "署名の有効期間は? (%s)"
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "無効な値\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "%sは無期限です\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "%署名は無期限です\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "鍵は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "署名は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4886,11 -3812,9 +4903,11 @@@ msgstr "
  "このシステムでは、2038年以降の日付を表示することはできませんが、\n"
  "2106年まで正しく処理されます。\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "これで正しいですか? (y/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4904,7 -3828,6 +4921,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4920,49 -3843,38 +4937,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "本名: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "名前に無効な文字があります\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "名前を数字で始めてはいけません\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "名前は5文字以上でなければなりません\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "電子メール・アドレス: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "有効な電子メール・アドレスではありません\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "コメント: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "コメントに無効な文字があります\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "あなたは文字集合'%s'を使っています。\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -4973,7 -3885,6 +4990,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
  
@@@ -4988,31 -3899,24 +5005,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "まずエラーを修正してください\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5023,13 -3927,10 +5040,13 @@@ msgstr "
  "す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
  "成器に十分なエントロピーを供給する機会を与えることができます。\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "鍵の生成に失敗しました: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5040,62 -3941,49 +5057,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "続けますか? (Y/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" の鍵はもうあります\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "それでも鍵を作成しますか? (y/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "いずれにしろ鍵を作成\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "鍵の生成が取り消されました。\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "'%s'へ公開鍵を書き込みます\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5103,31 -3991,25 +5120,31 @@@ msgstr "
  "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
  "\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鍵の秘密部分が利用できません。\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鍵の秘密部分はカード上に保存されています。\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "本当に作成しますか? (y/N) "
  
@@@ -5203,30 -4069,25 +5220,30 @@@ msgstr "   フィンガープリント 
  msgid "      Card serial no. ="
  msgstr "   カードシリアル番号 ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "鍵リング'%s'をキャッシュします\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "これまで%lu個の鍵をキャッシュしました (%lu個の署名)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] "%lu個の鍵をキャッシュしました"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
  msgstr[0] " (%lu個の不正な署名)\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: 鍵リングができました\n"
@@@ -5515,7 -4314,6 +5532,7 @@@ msgstr "バイナリ
  msgid "textmode"
  msgstr "テキストモード"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "不明の"
  
@@@ -5724,50 -4480,39 +5741,50 @@@ msgstr "*警告*: 潜在的にセキュ
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "エージェントに問題: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "パスフレーズを入力\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "ユーザによる取消し\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (主鍵ID %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "OpenPGPの秘密鍵のロックを解除するためにパスフレーズを入力してください:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "OpenPGPの秘密鍵をインポートするためにパスフレーズを入力してください:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr ""
  "OpenPGPの秘密副鍵をエクスポートするためにパスフレーズを入力してください:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "OpenPGPの秘密鍵をエクスポートするためにパスフレーズを入力してください:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "選択したOpenPGP副鍵を本当に永久に削除しますか? (y/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "選択したOpenPGP秘密鍵を本当に永久に削除しますか? (y/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6184,17 -4846,14 +6201,17 @@@ msgstr "DEKの旧式エンコーディ�
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "暗号アルゴリズム%d%sは不明か使用禁止です\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "*警告*: 暗号アルゴリズム%sは受取人の優先指定に入っていません\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "*注意*: 秘密鍵%sは%sで期限切れとなります\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "*注意*: 鍵は失効済みです"
  
@@@ -6472,7 -5082,6 +6489,7 @@@ msgstr "*警告*: 優先鍵サーバURL
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s署名。署名者:\"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6480,11 -5089,9 +6497,11 @@@ msgstr "
  "*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
  "ます\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "署名:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s暗号化を使用します\n"
@@@ -6543,17 -5139,14 +6560,17 @@@ msgstr "無効なフィンガープリ�
  msgid "ownertrust value missing"
  msgstr "所有者信用度がありません"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "'%s'で信用レコードの検索エラー: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "'%s'で読み込みエラー: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信用データベース: 同期に失敗しました: %s\n"
@@@ -6587,7 -5174,6 +6604,7 @@@ msgstr "信用データベースのト�
  msgid "%s: directory does not exist!\n"
  msgstr "%s: ディレクトリがありません!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "'%s'にアクセスできません: %s\n"
@@@ -6725,10 -5283,6 +6742,10 @@@ msgstr "'ultimately_trusted_keys' TOFU�
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "TOFUデータベースの読み込みエラー: %s\n"
@@@ -6758,7 -5307,6 +6775,7 @@@ msgstr "バインディングDBにカ�
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "TOFUデータベースの更新エラー: %s\n"
@@@ -6917,11 -5438,11 +6934,13 @@@ msgstr "
  "(G)ood-良, (A)ccept once-一度だけ認める, (U)nknown-不明, (R)eject once-一度だ"
  "け否, (B)ad-ダメ? "
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ #, fuzzy
+ #| msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr "不明がデフォルトです。"
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr "TOFU dbが壊れていることが検出されました。\n"
  
@@@ -6930,108 -5450,88 +6949,108 @@@
  msgid "resetting keydb: %s\n"
  msgstr "keydbをリセット: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "TOFUバインディングのポリシーを %s に設定エラー\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "TOFUポリシーの作成エラー: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] "%lld年"
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] "%lld月"
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] "%lld週"
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] "%lld日"
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] "%lld時間"
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] "%lld分"
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] "%lld秒"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr "%s: 0個の署名を検証、0個のメッセージを暗号化しました。"
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, c-format
  msgid "%s: Verified 0 signatures."
  msgstr "%s: 0個の署名を検証しました。"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, 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
++#: g10/tofu.c:3142
  msgid "Encrypted 0 messages."
  msgstr "0 個のメッセージを暗号化しました。"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, 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
++#: g10/tofu.c:3161
  #, c-format
  msgid "(policy: %s)"
  msgstr "(ポリシー: %s)"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度も見てません!\n"
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度しか見てません!\n"
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr "警告: この鍵へは一つもメッセージを暗号化したことがありません!\n"
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr "警告: この鍵へは一つのメッセージしか暗号化したことがありません!\n"
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7052,19 -5552,16 +7071,20 @@@ msgstr[0] "
  "  %s\n"
  "でダメとマークしてください。\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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "TOFUデータベースのオープンでエラー: %s\n"
  
- #: g10/tofu.c:3482
- #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++#: g10/tofu.c:3498
+ #, fuzzy, c-format
+ #| msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  "*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです。\n"
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
  msgstr "鍵%s, ユーザID \"%s\"のポリシーの設定エラー: %s"
@@@ -7112,76 -5600,61 +7132,76 @@@ msgstr "trustdbを下記のコマンド
  msgid "If that does not work, please consult the manual\n"
  msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s信用モデルを使用\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "次回の信用データベース検査は、%sです\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "公開鍵%sが見つかりません: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "--check-trustdbを実行してください\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "信用データベースの検査\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%d個の鍵を処理"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] " (うち%d本の有効性数をクリア)\n"
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "究極的に信用する鍵が見つかりません\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7292,19 -5744,14 +7312,19 @@@ msgstr "
  "形式:  kbxutil [オプション] [ファイル]\n"
  "Keyboxデータを一覧、エクスポート、インポート\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PINコールバックがエラーを返しました: %s\n"
@@@ -7351,7 -5789,6 +7371,7 @@@ msgid "
  msgstr ""
  "|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "新しいPINの取得エラー: %s\n"
@@@ -7366,68 -5801,68 +7386,85 @@@ msgstr "指紋の保管に失敗しま�
  msgid "failed to store the creation date: %s\n"
  msgstr "生成日の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "カードからCHVステイタスの取得でエラー\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "応答にRSAのモジュラスが含まれていません\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "応答にRSA公開指数が含まれていません\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  msgid "response does not contain the EC public key\n"
  msgstr "応答に楕円曲線の公開鍵が含まれていません\n"
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "応答に公開鍵データが含まれていません\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "公開鍵の読み込みに失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "デフォルトPINを%sとして使います\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||PINを入力してください%%0A[署名数: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||PINを入力してください"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "CHV%dの認証に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "カードからCHVステイタスの取得でエラー\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "カードが永久にロックされてます!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7435,25 -5870,19 +7472,24 @@@
  msgstr[0] "カードの永久ロック前に%d回の管理者PINの試行が残っています\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:2086
- #, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "|A|管理者PINを入力してください%%0A[残り回数: %d]"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|管理者PINを入力してください"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "管理コマンドへのアクセスが設定されていません\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||PINを入力してください"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||カードのリセット・コードを入力してください"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@@ -7461,106 -5890,82 +7497,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|新しいリセット・コード"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新しい管理者PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|新しいPIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||管理者PINと新しい管理者PINを入力してください"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||PINと新しいPINを入力してください"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "アプリケーション・データの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "鍵はもうあります\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "既存の鍵は置き換えられます\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "新しい鍵を生成\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "新しい鍵を書き込み\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "作成時刻スタンプがありません\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "鍵の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "サポートされていない曲線\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "鍵生成の間、お待ちください ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "鍵の生成に失敗しました\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "これまでに作成された署名: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@@ -7580,51 -5982,39 +7616,51 @@@ msgstr "|N|初期の新しいPIN
  msgid "run in multi server mode (foreground)"
  msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|FILEにログを書き出します"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|ポートNのリーダに接続します"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAME|ct-APIドライバとしてNAMEを用います"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|PC/SCドライバとしてNAMEを用います"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "内蔵CCIDドライバを使いません"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|N秒アクティブでない場合、カードへの接続を切ります"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "リーダのピンパッドを使わない"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "管理カード・コマンドの使用を拒否"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "ピンパッドの可変長入力を使う"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "使い方: @SCDAEMON@ [オプション] (ヘルプは -h)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7638,22 -6027,14 +7674,17 @@@ msgstr "
  "'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
  "い\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %dのハンドラが開始されました\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %dのハンドラが終了しました\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "無効な64進文字%02Xをスキップしました\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "このセッションでdirmngrは実行されていません\n"
  
@@@ -7670,12 -6048,10 +7701,12 @@@ msgstr "chain
  msgid "shell"
  msgstr "shell"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "クリティカルな証明書の拡張%sはサポートされていません"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "発行者の証明書がCAとしてマークされていません"
  
@@@ -7688,11 -6062,9 +7719,11 @@@ msgstr "コンフィグされたポリ�
  msgid "failed to open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "注意: クリティカルでない証明書ポリシーは認められません"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "証明書ポリシーは認められません"
  
@@@ -7719,9 -6086,6 +7750,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -7742,12 -6102,10 +7773,12 @@@ msgstr "\"dirmngr\" が正しくイン�
  msgid "checking the CRL failed: %s"
  msgstr "CRLの検査に失敗しました: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "無効の妥当性の証明書: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "証明書はまだ有効ではありません"
  
@@@ -7759,7 -6115,6 +7790,7 @@@ msgstr "ルート証明書がまだ有�
  msgid "intermediate certificate not yet valid"
  msgstr "中間証明書はまだ有効ではありません"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "証明書が有効期限を過ぎています"
  
@@@ -7808,7 -6152,6 +7839,7 @@@ msgstr "  (     証明書、有効
  msgid "  (     issuer valid from "
  msgstr "  (     発行者、有効"
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "フィンガープリント=%s\n"
@@@ -7840,7 -6177,6 +7871,7 @@@ msgstr "証明書の発行者があり�
  msgid "self-signed certificate has a BAD signature"
  msgstr "自己署名証明書に*不正な*署名があります"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "ルート証明書が信用できるとマークされていません"
  
@@@ -7849,28 -6184,22 +7880,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "信用リストの検査に失敗しました: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "証明書のチェインが長すぎます\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "発行者証明書が見つかりません"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "証明書に*不正な*署名があります"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "別の一致する可能性があるCA証明書が見つかりました - 再度試します"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "証明書のチェインがCAにより認められたもの(%d)より長くなっています"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "証明書は正しいです\n"
  
@@@ -7896,11 -6220,9 +7927,11 @@@ msgstr "使用した検証モデル: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%uビットハッシュは%uビットの%s鍵には無効です\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(これはMD2アルゴリズムです)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "none"
  
@@@ -7935,36 -6252,28 +7966,36 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "作成 %s, 有効期限 %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "鍵の使い方が指定されていません - すべての使い道を仮定します\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "鍵使用情報の取得エラー: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "証明書は証明のために使われるべきではありませんでした\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "証明書はOCSP応答の署名のために使われるべきではありませんでした\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "証明書は暗号化のために使われるべきではありませんでした\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "証明書は署名のために使われるべきではありませんでした\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "証明書は暗号化のために使えません\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "証明書は署名のために使えません\n"
  
@@@ -8058,7 -6349,6 +8089,7 @@@ msgstr "行 %d: keygrip'%s'から鍵の
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "行 %d: 鍵の生成に失敗しました: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8066,64 -6356,51 +8097,64 @@@ msgstr "
  "この証明書要求を完成するために今作った鍵のパスフレーズをもう一度入力してくだ"
  "さい。\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) 既存の鍵\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) カードに存在する鍵\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "カードの読み込みエラー: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "カードのシリアル番号: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "利用可能な鍵:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "%s鍵に可能な操作:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) 署名、暗号化\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) 署名\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) 暗号化\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "X.509のサブジェクト名を入力: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "サブジェクト名がありません\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "無効なサブジェクト名ラベル'%.*s'です\n"
@@@ -8133,72 -6410,55 +8164,72 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "無効なサブジェクト名'%s'です\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "33"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "電子メール・アドレスを入力"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (空行で終了):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "DNS名を入力"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (オプションです。空行で終了):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "URIを入力"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "自己署名証明書を作成しますか? (y/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "下記のパラメータが使われます:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "今、自己署名証明書を作成しています。  "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "今、証明書要求を作成しています。  "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "しばらくかかります...\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "準備完了。\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "準備ができました。今、この要求をあなたのCAに送るべきです。\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "リソースの問題: メモリがありません\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(RC2アルゴリズムです)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(暗号化されたメッセージではないようです)\n"
  
@@@ -8331,7 -6560,6 +8362,7 @@@ msgstr "|FILE|鍵リングを鍵リン�
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|このキーサーバを鍵の検索に使う"
  
@@@ -8413,17 -6625,14 +8444,17 @@@ msgstr "証明書の保存に失敗し�
  msgid "basic certificate checks failed - not imported\n"
  msgstr "基本証明書チェックが失敗しました - インポートされませんでした\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "保存されたフラグの取得エラー: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "証明書のインポート・エラー: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "入力読み込みエラー: %s\n"
@@@ -8492,7 -6690,6 +8523,7 @@@ msgstr "
  "\n"
  "%s%s本当にこれを望みますか?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8511,161 -6707,132 +8542,167 @@@ msgstr "
  "\"%s\"\n"
  "注意してください: この証明書は署名を作るために作成されていません!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "ハッシュ・アルゴリズム %d (%s)(署名人 %d へ)はサポートされていません。%s を使"
  "います\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "署名者 %dのために使われたハッシュアルゴリズム: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "適正な認定証明書の検査に失敗しました: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "施された署名 "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[日時指定なし]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " 証明書 ID 0x%08lXを用います\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "無効な署名: メッセージ・ダイジェストの属性が計算されたものと一致しません\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "正しい署名"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "      別名"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "これは認定署名です\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "証明書キャッシュのロックが初期化できません: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "証明書キャッシュの読み出しロックが取得できません: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "証明書キャッシュの書き込みロックが取得できません: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "証明書キャッシュのロックが解除できません: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "%uの証明書をキャッシュからはずします\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "証明書'%s'が解析できません: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "証明書'%s'はすでにキャッシュされています\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "信用される証明書'%s'をロードしました\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "証明書'%s'をロードしました\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  SHA1フィンガープリント = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "   発行者 ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "サブジェクト ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "証明書'%s'の読み込みエラー: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "永続的にロードされる証明書: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "実行時キャッシュ証明書の数: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "実行時キャッシュ証明書の数: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "   すでにキャッシュされた証明書\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "キャッシュされた証明書\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "証明書のキャッシュのエラー: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "無効なSHA1フィンガープリント文字列'%s'\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "S/Nでの証明書取得エラー : %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "サブジェクトでの証明書取得エラー: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "証明書に発行者がみつかりません\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "authorityKeyIdentifierの取得エラー: %s\n"
@@@ -8700,7 -6861,6 +8737,7 @@@ msgstr "キャッシュ・ファイル
  msgid "not removing file '%s'\n"
  msgstr "ファイル'%s'を削除しません\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "キャッシュ・ファイルでクローズのエラー: %s\n"
@@@ -8922,7 -7038,6 +8959,7 @@@ msgstr "S/N %sは有効です。CRLに�
  msgid "error getting data from cache file: %s\n"
  msgstr "キャッシュ・ファイルからデータの取得エラー: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "不明なハッシュ・アルゴリズム'%s'\n"
@@@ -8936,12 -7049,10 +8973,12 @@@ msgstr "アルゴリズム%dのgcry_md_
  msgid "got an invalid S-expression from libksba\n"
  msgstr "libksbaから無効なS-式を取得しました\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "S式の変換に失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "S式の作成に失敗しました: %s\n"
@@@ -8989,84 -7091,68 +9026,84 @@@ msgstr "CRL発行証明書をauthorityK
  msgid "CRL signature verification failed: %s\n"
  msgstr "CRL署名の検証に失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "CRL発行者証明書の検証検査エラ−: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "ksba_crl_new が失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "ksba_crl_set_reader が失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "古い一時キャッシュ・ファイル'%s'を削除しました\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "古い一時キャッシュ・ファイル'%s'が削除の問題: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "一時キャッシュ・ファイル'%s'の作成エラー: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "crl_parse_insert が失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "一時キャッシュ・ファイル'%s'の終了エラー: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "一時キャッシュ・ファイル'%s'のクローズ・エラー: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込み"
  "ます\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "新しいCRLはまだ古すぎます。%sに期限がきています\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "不明のクリティカルCRLの拡張 %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "CRL拡張の読み込みエラー: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "キャッシュ・ファイル'%s'の作成\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "'%s'から'%s'へ名前変更の問題: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9074,64 -7160,51 +9111,64 @@@ msgstr "
  "DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われ"
  "ます\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "CRLダンプの開始 (%s から取得)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr "*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr "*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr "*エラー*: CRLは使用されません\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr "*エラー*: このキャッシュされたCRLは変更されているかもしれません!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr "*警告*: 無効なキャッシュ・レコード長\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "キャッシュ・レコードの読み込みの問題: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "キャッシュ鍵の再読み込みの問題: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "dbからキャッシュ・エントリの読み込みエラー: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "CRLダンプの終了\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "DPからcrl_fetchが失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "DPからcrl_cache_insertが失敗しました: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "発行者からcrl_cache_insertが失敗しました: %s\n"
@@@ -9140,47 -7212,35 +9177,47 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "readerからファイル・マッピングのテーブルがいっぱいです - 待ちます\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "\"http\" を \"https\" の代わりに使います\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "リーダ・オブジェクトの初期化エラー: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "URL'%s' は '%s' (%u) へリダイレクトされました\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "リダイレクトが多すぎます\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "'%s'を取得する際のエラー: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "'%s'の取得エラー: httpステイタス %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "CRLアクセスはTorモードのため不可能です\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "禁止されているため、証明書の探索ができません: %s\n"
@@@ -9321,112 -7352,84 +9358,112 @@@ msgstr "絶対ファイル名がきま�
  msgid "looking up '%s'\n"
  msgstr "'%s'を検索します\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "CRLキャッシュの内容をリストします"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|FILEからCRLをキャッシュにロードする"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|URLからCRLを取得します"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "dirmngrをシャットダウンする"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "キャッシュをフラッシュします"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "ユーザに問い合わせせずに実行"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "期日の過ぎたCRLのロードを強制する"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "OCSP要求の送信を認める"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "HTTPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "LDAPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "HTTP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "LDAP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "OCSPサービスURLに入っている証明書を無視する"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "--ldap-proxy にフォールバック・ホストを使わない"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|LDAPのタイムアウトをN秒とする"
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|OCSP応答としてURLを使用"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|FPRで署名されたOCSPレスポンス"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "ネットワーク・トラフィックをすべてTor経由にする"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9435,11 -7438,9 +9472,11 @@@ msgstr "
  "@\n"
  "(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9447,77 -7448,60 +9484,77 @@@ msgstr "
  "形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有効なdebugレベルは: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "使い方: %s [オプション] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "コロンはソケット名に許されません\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの取得の失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの処理に失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 読み込みエラー: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 行末のゴミを無視\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERMを受け取り - シャットダウン...\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "強制的にシャットダウンする\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9747,35 -7683,28 +9784,35 @@@ msgstr "ホスト名に無効な文字 
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "'%s:%d'をLDAPサーバ・リストに追加\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "mallocが失敗しました: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: 無効なパターン '%s'\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search がサーバのサイズ限界を越えました\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "無効な正規S式が見つかりました\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "gcry_md_openに失敗しました: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "おっと: ksba_cert_hashが失敗しました: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "不正なURLエンコーディングが検出されました\n"
  
@@@ -9807,243 -7730,187 +9844,239 @@@ msgstr "OCSPターゲットの設定エ
  msgid "error building OCSP request: %s\n"
  msgstr "OCSP要求のビルド・エラー: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "'%s'の接続エラー: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "'%s'のHTTP応答の読み込みエラー: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "'%s'に対するOCSP応答構文解析エラー: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "OSCP応答が '%s' でステイタス: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "'%s'に対するOCSP応答のハッシングに失敗しました: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "デフォルトOCSP署名者の証明で署名されていません"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "SHA-1だけがOCSPレスポンスとしてサポートされています\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "リスト項目の確保に失敗しました: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "応答IDの取得エラー: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "OCSP応答を検証する適切な証明書がありませんでした\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "発行者証明書が見つかりません: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "呼出側が対象の証明書を返しませんでした\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "呼出側が発行される証明書を返しませんでした\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "OCSPコンテクストの確保に失敗しました: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "authorityInfoAccessを取得できません: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "デフォルトOCSPレスポンダが定義されていません\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "デフォルトのOCSP署名者が定義されていません\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "デフォルトOCSP応答'%s'を使います\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "OCSP応答'%s'を使います\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "OCSPのハッシュ・コンテクストを確立するのに失敗しました: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "対象の証明書のOCSPステイタスの取得エラー: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "証明書ステイタスは: %s (これ=%s 次=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "良好"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "証明書は失効済みです: %s (理由: %s)\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "OSCPレスポンダは未来のステイタスを返しました\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "OSCPレスポンダは現在でないステイタスを返しました\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s)が失敗しました: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "ldapserverがありません"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "serialnoがcert IDにありません"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquireに失敗しました: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url が失敗しました: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "データ送信エラー: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch が失敗しました: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert が失敗しました: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d を越えました\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "制御構造を確保できません: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "assuanコンテクストの確保に失敗しました: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "サーバの初期化に失敗しました: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "Assuanで登録コマンドに失敗しました: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept の問題: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuanの処理が失敗しました: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr "CAとしてマークされていないルートCAを受領します"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "CRL検査のネストが深すぎです\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "CRL を確認しません"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "CRLの検査をしています"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "自己署名証明書に*不正な*署名があります"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "ルート証明書の信用検査に失敗しました: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "証明書チェインは正しいです\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSAは160ビットののハッシュアルゴリズムの使用を必要とします\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
  
@@@ -10138,185 -7984,138 +10171,185 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "コンフィグレーションを制御するオプション"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "デバッグのために有用なオプション"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "セキュリティを制御するオプション"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|N秒後にSSH鍵を無効とする"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|最大PINキャッシュ存続時間をN秒とする"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|最大SSH鍵存続時間をN秒とする"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "パスワード・ポリシーの強制オプション"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "パスワード・ポリシーを迂回することを認めない"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|新しいパスフレーズの必要とする最低長をNとする"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  "|N|新しいパスフレーズとしてアルファベットでないキャラクタを最低N必要とする"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FILE|新しいパスフレーズをFILEのパターンに対してチェックする"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|N日後にパスフレーズを期限切れとする"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "古いパスフレーズを再使用することを認めない"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|PinentryのタイムアウトをN秒とする"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|ユーザID NAMEにも暗号化する"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|電子メールエイリアスを設定する"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "キーサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|鍵サーバとしてURLを使用"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "PKA検索(DNS要求)を認める"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECHANISMS|メールアドレスによって鍵を特定する際、MECHANISMSを使用する"
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "dirmngrへのすべてのアクセスを無効とする"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|PKCS#12のパスフレーズにNAMEのエンコーディングを使う"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "ルート証明書のCRLをチェックしない"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "出力フォーマットを制御するオプション"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "インタラクティビティと強制を制御するオプション"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Torの使用を制御するオプション"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "HTTPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "システムのHTTPプロキシ設定を用います"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "使用するLDAPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAPサーバ・リスト"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "OCSPのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr "プライベート鍵"
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr "スマートカード"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr "ネットワーク"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  msgid "Passphrase Entry"
  msgstr "パスフレーズ入力"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "コンポーネントが起動するために適切ではありません"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "コンポーネント%sの外部の検証が失敗しました"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "グループ仕様は無視されていることに注意してください\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, c-format
  msgid "error closing '%s'\n"
  msgstr "'%s'でクローズのエラー\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, c-format
  msgid "error parsing '%s'\n"
  msgstr "'%s'でパーズのエラー\n"
diff --cc po/nb.po
index c22cace,d104bf5..5417f0d
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -23,7 -22,6 +23,7 @@@
  "X-Generator: Poedit 1.5.4\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@@ -34,45 -32,35 +34,45 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Avbryt"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Ja"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_Nei"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Lagre i passordbehandler"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Gjør passordfrase synlig"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Skjul passordfrase"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -82,20 -70,17 +82,20 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
  "hvordan kvaliteten vurderes."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  "Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
  "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
  "gjeldende økt"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Passordfrase:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "feil. Prøv igjen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (forsøk %d av %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Gjenta:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "For lang PIN"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "For lang passordfrase"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Ugyldig tegn i PIN"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "Koden er for kort"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Ugyldig PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Ugyldig passordfrase"
  
@@@ -158,49 -129,35 +158,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "klarte ikke å åpne «%s»: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "feil under henting av kort-serienummer: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "oppdaget kort med serienummer %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "ingen ssh-autentiseringnøkkel på kort: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "fant ingen passende kortnøkkel: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "feil under henting av lagrede valg: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -209,24 -166,19 +217,24 @@@ msgstr "
  "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A  %s%%0A  (%s)%%0AVil "
  "du tillate dette?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Tillat"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Avvis"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Skriv inn denne passordfrasen på nytt"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -235,68 -187,53 +243,68 @@@ msgstr "
  "Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
  "%%0A   %s%%0A   %s%%0Ai nøkkellageret for gpg-agent"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "klarte ikke å lage strøm av sokkel: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Sett inn kort med serienummer"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Admin-PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Tilbakestillingskode"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Gjenta tilbakestillingskode"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Gjenta PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Gjenta PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "feil under oppretting av midlertidig fil: %s\n"
@@@ -376,47 -299,32 +384,47 @@@ msgstr "
  "@Valg:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "kjør som bakgrunnsprosess («daemon»)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "kjør i tjenermodus (forgrunn)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "kjør i tjenermodus"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sh-utdata for kommandoer"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "csh-utdata for kommandoer"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "ikke løsne fra konsoll"
  
@@@ -491,11 -382,6 +499,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
  
@@@ -511,43 -395,30 +519,43 @@@ 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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "valgfil «%s»: %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "leser valg fra «%s»\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Merk: «%s» regnes ikke som et valg\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "klarte ikke å lage sokkel: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "sokkelnavnet «%s» er for langt\n"
@@@ -556,27 -426,21 +564,27 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "feil under henting av sokkel-anledning\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "feil under knytning av sokkel til «%s»: %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislyktes: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "lytter på sokkel «%s»\n"
@@@ -603,7 -461,6 +611,7 @@@ msgstr "stat() mislyktes for «%s»: %s
  msgid "can't use '%s' as home directory\n"
  msgstr "«%s» kan ikke brukes som hjemmemappe\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "feil under lesing av anledning på fd %d: %s\n"
@@@ -628,12 -481,10 +636,12 @@@ msgstr "startet ssh-behandler 0x%lx fo
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect mislyktes: %s - venter 1s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
@@@ -655,8 -502,6 +663,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
  "Vedlikehold av hurtiglager for passord\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -664,9 -509,6 +672,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -720,8 -554,6 +728,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "feil under åpning av «%s»: %s\n"
@@@ -781,8 -604,6 +789,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nei"
  
@@@ -835,7 -649,6 +843,7 @@@ msgstr "Endre passordfrase
  msgid "I'll change it later"
  msgstr "Jeg endrer senere"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -843,11 -656,9 +851,11 @@@
  msgstr ""
  "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Slett nøkkel"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -870,7 -678,6 +878,7 @@@ msgstr "%s nøkkel bruker utrygg kontro
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@@ -894,22 -697,14 +902,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "feil under opprettelse av datarør: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "feil under opprettelse av strøm for datarør: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "feil under kopiering av prosess: %s\n"
@@@ -925,8 -718,6 +933,8 @@@ msgid "error running '%s': probably no
  msgstr ""
  "feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
@@@ -936,12 -726,10 +944,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "feil under kjøring av «%s». Avsluttet\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "venting på avslutning av prosesser mislyktes: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
@@@ -1156,8 -898,6 +1164,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ustøttet algoritme: %s"
@@@ -1277,7 -990,10 +1285,12 @@@ msgstr "ignorerer ubrukelig linje
  msgid "[none]"
  msgstr "[ingen]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "hoppet over ugyldig radix64-tegn %02x\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "uforventet argument"
  
@@@ -1343,7 -1045,6 +1356,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "kjernen er full\n"
  
@@@ -1401,8 -1091,6 +1414,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (krever %s, har %s)\n"
@@@ -1557,8 -1212,6 +1570,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1218,9 +1579,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Ditt valg? "
  
@@@ -1635,16 -1268,10 +1648,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "feil under lesing av «%s»: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "feil under skriving av «%s»: %s\n"
@@@ -1704,7 -1318,6 +1717,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "feil under henting av nøkkelinfo: %s\n"
@@@ -1738,13 -1346,10 +1751,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rundet opp til %u bit\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
@@@ -1798,9 -1393,6 +1811,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ugyldig valg.\n"
  
@@@ -1921,22 -1484,14 +1934,22 @@@ msgstr "Ugyldig kommando  (prøv «help
  msgid "--output doesn't work for this command\n"
  msgstr "«--output» virker ikke med denne kommandoen\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1537,6 +2007,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "feil under opprettelse av passordfrase: %s\n"
@@@ -2031,7 -1567,6 +2044,7 @@@ msgstr "
  "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
  "mottakers oppsett\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2154,36 -1665,27 +2167,36 @@@ msgstr "fjern så mye som mulig fra nø
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr ". Hoppet over"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "skriver til «%s»\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nøkkel %s: PGP 2.x-aktig nøkkel - hoppet over\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: ingenting eksportert\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2440,7 -1881,6 +2453,7 @@@ msgstr "|N|endre komprimeringsnivå ti
  msgid "use canonical text mode"
  msgstr "bruk kanonisk tekstmodus"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv utdata til valgt FIL"
  
@@@ -2613,453 -2025,355 +2626,457 @@@ msgstr "ADVARSEL: utrygge tillatelser t
  msgid "unknown configuration item '%s'\n"
  msgstr "oppsettselementet «%s» er ukjent\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "vis foto-id-er i nøkkelvisning"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "vis regeladresser i signaturvisning"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "vis alle notater i signaturvisning"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotater under signaturvisning"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brukervalgte notater under signaturvisning"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "vis nøkkelknippe-navn i nøkkelvisning"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "vis utløpsdatoer i nøkkelvisning"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "«%s» er et ukjent TOFU-regelverk\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(bruk «help» for å vise valg)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» er en ugyldig signatur-utløpstid\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» er ikke et gyldig tegnsett\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "filtervalget %s er ugyldig\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listevalg\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "ugyldige listevalg\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "vis bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "vis adresser til retningslinjer under signaturbekreftelse"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "vis alle merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotater under signaturbekreftelse"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "vis selvvalgte merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "kontroller signaturer som har PKA-data"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "klarte ikke å endre «exec»-sti til %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overstyrere %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "du kan ikke bruke %s med %s.\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s gir ikke mening med %s.\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kjører med falsk systemtid: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt krypteringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "«completes-needed» må være større enn 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "«marginals-needed» må være større enn 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "ugyldig standardoppsett\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker ikke enda med %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sending til nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøkkeleksport mislyktes: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "søk på nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dearmoring failed: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enarmoring failed: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "«%s» er en ugyldig summeringsalgoritme\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, 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:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv inn melding …\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "valgt adresse for signaturregler er ugyldig\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "la konflikter mellom tidsstempler bare være en advarsel"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skrive statusinfo til denne FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|avvis signaturer som er laget med valgt ALGOritme"
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Bruk: gpgv [valg] [filer] (-h for hjelp)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4349,14 -3398,9 +4366,14 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "opphevet"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "utgått"
  
@@@ -4394,7 -3432,6 +4411,7 @@@ msgstr "Er du sikker på at du vil legg
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
  
@@@ -4425,7 -3456,6 +4442,7 @@@ msgstr[1] "Slettet %d signaturer.\n
  msgid "Nothing deleted.\n"
  msgstr "Ingen ble slettet.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "ugyldig"
  
@@@ -4657,71 -3639,55 +4674,71 @@@ msgstr "Undernøkkel %s er allerede opp
  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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "innstilling «%s» er duplisert\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "for mange krypteringsinnstillinger\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "for mange kontrollsum-innstillinger\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringsinnstillinger\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "«%s» er et ugyldig oppsettsvalg\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "skriver direkte signatur\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "skriver selvsignatur\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "skriver nøkkelbindende signatur\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøkkelstørrelse rundet opp til %u bit\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Signere"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Bekrefte"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Kryptere data"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Autentisere"
  
@@@ -4739,150 -3705,119 +4756,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handlinger med en %s-nøkkel: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Tillatte handlinger: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Slå av/på signeringsfunksjon\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Ferdig\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Velg hvilken type nøkkel du vil ha:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (bare signering)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (bare signering)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (bare kryptering)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (bare kryptering)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC og ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (kun signering)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (velg funksjoner selv)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (kun kryptering)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Nøkkel\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Skriv inn nøkkelgrep: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "rundet av til %u bit\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvor stor skal nøkkelen være? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Forespurt nøkkelstørrelse er %u bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Velg elliptisk kurve:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4898,7 -3833,6 +4915,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4914,38 -3848,30 +4931,38 @@@ msgstr "
  "      <n>m = signaturen utgår om n months\n"
  "      <n>y = signaturen utgår om n years\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Nøkkelen er gyldig for? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen er gyldig for? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "ugyldig verdi\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Nøkkel utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøkkel utgår %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen utgår %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4953,11 -3879,9 +4970,11 @@@ msgstr "
  "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
  "Likevel håndteres det korrekt frem til 2106.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt (j/N)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4971,7 -3895,6 +4988,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4987,49 -3910,38 +5004,49 @@@ msgstr "
  "    «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Fullt navn: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Ugyldig tegn i navn\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, 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:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Navn kan ikke begynne med siffer\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navnet må bestå av minst 5 tegn\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-postadresse: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Ugyldig e-postadresse\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Ugyldig tegn i kommentar\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Du bruker tegnsettet «%s».\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5040,7 -3952,6 +5057,7 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5055,31 -3966,24 +5072,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKeEeRrAa"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Rett opp feilen først\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5091,13 -3995,10 +5108,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøkkelgenerering mislyktes: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5108,63 -4009,50 +5125,63 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Vil du fortsette? (J/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Det finnes allerede en nøkkel for «%s»\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Vil du lage nøkkel likevel? (j/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "lager likevel\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, 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:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Nøkkelgenerering ble avbrutt.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "skriver offentlig nøkkel til «%s»\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5173,7 -4061,6 +5190,7 @@@ msgstr "
  "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
  "undernøkkel til dette formålet.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5181,7 -4068,6 +5198,7 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekund i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5189,20 -4075,16 +5206,20 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Er du sikker på at du vil fortsette? (j/N) "
  
@@@ -5281,33 -4147,28 +5298,33 @@@ msgstr "      Nøkkelfingeravtrykk =
  msgid "      Card serial no. ="
  msgstr "      Serienummer for kort ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "hurtiglagrer nøkkelknippe «%s»\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu nøkler hurtiglagret så langt (%lu signatur)\n"
  msgstr[1] "%lu nøkler hurtiglagret så langt (%lu signaturer)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] "%lu nøkkel hurtiglagret"
  msgstr[1] "%lu nøkler hurtiglagret"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
  msgstr[0] " (%lu signatur)\n"
  msgstr[1] " (%lu signaturer)\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: laget nøkkelknippe\n"
@@@ -5600,7 -4399,6 +5617,7 @@@ msgstr "binær
  msgid "textmode"
  msgstr "tekstmodus"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "ukjent"
  
@@@ -5805,50 -4561,39 +5822,50 @@@ msgstr "ADVARSEL: det er usikkert å kr
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "underpakke %d er merket som kritisk\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problem med agent: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Skriv inn passordfrase\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "avbrutt av bruker\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (hovednøkkelid %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Skriv inn passordfrase for å låse opp hemmelig OpenPGP-nøkkel:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Skriv inn passordfrase for å importere hemmelig OpenPGP-nøkkel:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-undernøkkel:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-nøkkel:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr ""
  "Er du sikker på at du vil slette følgende hemmelige OpenPGP-undernøkkel:"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Er du sikker på at du vil slette følgende hemmelige OpenPGP-nøkkel:"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6279,17 -4941,14 +6296,17 @@@ msgstr "gammel DEK-koding støttes ikke
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "krypteringsalgoritme %d%s er ukjent eller slått av\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "ADVARSEL: fant ikke krypteringsalgoritme %s i mottakers oppsett\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "Merk: hemmelig nøkkel %s utgått %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "Merk: nøkkelen er opphevet"
  
@@@ -6588,17 -5198,14 +6605,17 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s-signatur fra: «%s»\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "signerer:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bruker %s-kryptering\n"
@@@ -6656,17 -5252,14 +6673,17 @@@ msgstr "ugyldig fingeravtrykk
  msgid "ownertrust value missing"
  msgstr "verdi for eiertillit mangler"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "feil under søk etter tillitspost i «%s»: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "lesefeil i «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synk mislyktes: %s\n"
@@@ -6700,7 -5287,6 +6717,7 @@@ msgstr "trustdb-transaksjon er for stor
  msgid "%s: directory does not exist!\n"
  msgstr "%s: mappa finnes ikke.\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "fikk ikke tilgang til «%s»: %s\n"
@@@ -6839,10 -5397,6 +6856,10 @@@ msgstr "feil under oppretting av midler
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "feil under lesing av TOFU-database: %s\n"
@@@ -6873,7 -5422,6 +6890,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "feil under åpning av TOFU-database «%s»: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "feil under oppdatering av TOFU-database: %s\n"
@@@ -7079,11 -5600,9 +7096,11 @@@ msgstr "gGaAuUnNdD
  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:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7093,18 -5611,15 +7110,18 @@@
  msgid "resetting keydb: %s\n"
  msgstr "feil under skriving av nøkkel: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, 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:2794
++#: g10/tofu.c:2801
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "feil under endring av TOFU-regler: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, fuzzy, c-format
  #| msgid "%d~year"
  #| msgid_plural "%d~years"
@@@ -7113,7 -5628,6 +7130,7 @@@ msgid_plural "%lld~years
  msgstr[0] "%d~år"
  msgstr[1] "%d~år"
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, fuzzy, c-format
  #| msgid "%d~month"
  #| msgid_plural "%d~months"
@@@ -7122,14 -5636,12 +7139,14 @@@ msgid_plural "%lld~months
  msgstr[0] "%d~måned"
  msgstr[1] "%d~måneder"
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, fuzzy, c-format
  #| msgid "%d~day"
  #| msgid_plural "%d~days"
@@@ -7138,7 -5650,6 +7155,7 @@@ msgid_plural "%lld~days
  msgstr[0] "%d~dag"
  msgstr[1] "%d~dager"
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, fuzzy, c-format
  #| msgid "%d~hour"
  #| msgid_plural "%d~hours"
@@@ -7147,7 -5658,6 +7164,7 @@@ msgid_plural "%lld~hours
  msgstr[0] "%d~time"
  msgstr[1] "%d~timer"
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, fuzzy, c-format
  #| msgid "%d~minute"
  #| msgid_plural "%d~minutes"
@@@ -7156,7 -5666,6 +7173,7 @@@ msgid_plural "%lld~minutes
  msgstr[0] "%d~minutt"
  msgstr[1] "%d~minutter"
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, fuzzy, c-format
  #| msgid "%d~second"
  #| msgid_plural "%d~seconds"
@@@ -7165,20 -5674,17 +7182,20 @@@ msgid_plural "%lld~seconds
  msgstr[0] "%d~sekund"
  msgstr[1] "%d~sekunder"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, 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:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Slettet %d signaturer.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7195,13 -5701,11 +7212,13 @@@ msgstr[1] "
  "Bekreftet %ld meldinger signert av «%s»\n"
  "siste %s."
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "kryptert med %lu passordfraser\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid ""
  #| "Verified %ld message signed by \"%s\"\n"
@@@ -7218,13 -5722,11 +7235,13 @@@ msgstr[1] "
  "Bekreftet %ld meldinger signert av «%s»\n"
  "siste %s."
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "policy: %s"
  msgid "(policy: %s)"
  msgstr "regelverk: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  #, fuzzy
  #| msgid "Warning: we've have yet to see a message signed by this key!\n"
  msgid ""
@@@ -7233,7 -5735,6 +7250,7 @@@ msgstr "
  "Advarsel: vi har enda ikke sett en melding som er signert av denne "
  "nøkkelen.\n"
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  #, fuzzy
  #| msgid "Warning: we've only seen a single message signed by this key!\n"
  msgid ""
@@@ -7241,7 -5742,6 +7258,7 @@@
  msgstr ""
  "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  #, 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"
@@@ -7249,14 -5749,12 +7266,14 @@@ msgstr "
  "Advarsel: vi har enda ikke sett en melding som er signert av denne "
  "nøkkelen.\n"
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  #, 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:3216
++#: g10/tofu.c:3231
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7295,18 -5793,14 +7312,18 @@@ msgstr[1] "
  "Bruk %s \n"
  "for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "feil under åpning av TOFU-database: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7356,80 -5841,65 +7373,80 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruker tillitsmodell %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "kontroll av trustdb er ikke nødvendig\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "neste kontroll av trustdb planlagt %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "fant ikke offentlig nøkkel %s: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "kjør «--check-trustdb»\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, 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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7539,19 -5988,14 +7556,19 @@@ msgstr "
  "Syntaks: kbxutil [valg] [filer]\n"
  "Vis, eksporter eller importer Keybox-data\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-callback returnerte en feil: %s\n"
@@@ -7597,7 -6032,6 +7614,7 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "feil under henting av ny PIN: %s\n"
@@@ -7612,70 -6044,70 +7629,87 @@@ msgstr "klarte ikke å lagre fingeravtr
  msgid "failed to store the creation date: %s\n"
  msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "feil under henting av CHV-status fra kort\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar inneholder ikke RSA-modulus\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "svar inneholder ikke offentlig nøkkeldata\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruker forvalgt PIN som %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Skriv inn PIN%%0A[signaturer utført: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Skriv inn PIN-kode"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "bekreftelse av CHV%d mislyktes: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "feil under henting av CHV-status fra kort\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "kortet er låst for godt.\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7684,25 -6116,19 +7718,24 @@@ msgstr[0] "%d Admin-PIN-forsøk gjenst�
  msgstr[1] "%d Admin-PIN-forsøk gjenstår før kortet blir låst permanent\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Skriv inn admin-PIN"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Skriv inn PIN-kode"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Skriv inn tilbakestillingskode for kortet"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@@ -7710,107 -6136,83 +7743,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny tilbakestillingskode"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Skriv inn admin-PIN og ny admin-PIN"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Skriv inn PIN-kode og ny PIN-kode"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "feil under lesing av programdata\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "feil under lesing av fingeravtrykk DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "nøkkelen finnes allerede\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "gjeldende nøkkel blir erstattet\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "lager ny nøkkel\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "skriver ny nøkkel\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "tidsstempel for opprettelse mangler\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "klarte ikke å lagre nøkkel: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "ustøttet kurve\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "vent mens nøkkel blir generert …\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "nøkkelgenerering mislyktes\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer opprettet så langt: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@@ -7830,51 -6229,39 +7863,51 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FIL|skriv logg til valgt FIL"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|koble til leser via port N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "ikke bruk intern CCID-driver"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "ikke bruk kodetastatur"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "avvis bruk av admin-kortkommandoer"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "bruk inndata av vairabel lengde for kodetastatur"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7886,22 -6272,14 +7919,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "startet håndteringsprogram for fd %d\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "avsluttet håndteringsprogram for fd %d\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "hoppet over ugyldig radix64-tegn %02x\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "ingen dirmngr kjører i gjeldende økt\n"
  
@@@ -7918,12 -6293,10 +7946,12 @@@ msgstr "kjede
  msgid "shell"
  msgstr "skall"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "kritisk sertifikatutvidelse %s støttes ikke"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "utsteders sertifikat er ikke merket som CA"
  
@@@ -7936,11 -6307,9 +7964,11 @@@ msgstr "regelsett merket som kritisk ut
  msgid "failed to open '%s': %s\n"
  msgstr "klarte ikke å åpne «%s»: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Merk: ukritisk sertifikat-regelsett er ikke tillatt"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "sertifikatregelverk tillates ikke"
  
@@@ -7967,9 -6331,6 +7995,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -7990,12 -6347,10 +8018,12 @@@ msgstr "kontroller at «dirmngr» er in
  msgid "checking the CRL failed: %s"
  msgstr "kontroll av CRL mislyktes: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "sertifikatet er ikke gyldig enda"
  
@@@ -8007,7 -6360,6 +8035,7 @@@ msgstr "rotsertifikat er ikke gyldig en
  msgid "intermediate certificate not yet valid"
  msgstr "mellomsertifikat er ikke gyldig enda"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "sertifikatet er utgått"
  
@@@ -8056,7 -6397,6 +8084,7 @@@ msgstr "  (sertifikat gyldig fra 
  msgid "  (     issuer valid from "
  msgstr "  (     utsteder gyldig fra "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeravtrykk=%s\n"
@@@ -8086,7 -6420,6 +8114,7 @@@ msgstr "fant ingen utsteder i sertifika
  msgid "self-signed certificate has a BAD signature"
  msgstr "selvsignert sertifikat har ugyldig signatur"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "rotsertifikat er ikke merket som troverdig"
  
@@@ -8095,28 -6427,22 +8123,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontroll av tillitsliste mislyktes: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "sertifikatkjede er for langt\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "fant ikke utstedersertifikat"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "sertifikatet har ugyldig signatur"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "sertifikatet er gyldig\n"
  
@@@ -8142,11 -6463,9 +8170,11 @@@ msgstr "gyldighetsmodell: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(dette er algortime MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "ingen"
  
@@@ -8181,36 -6495,28 +8209,36 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "opprettet %s, utgår %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "sertifikatet skulle ikke vært brukt til signering\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "sertifikatet egner seg ikke til kryptering\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "sertifikatet egner seg ikke til signering\n"
  
@@@ -8305,7 -6593,6 +8333,7 @@@ msgstr "linje %d: feil under henting a
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "linje %d: nøkkelgenerering mislyktes: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8313,64 -6600,51 +8341,64 @@@ msgstr "
  "Skriv inn passordfrasen for nøkkelen én gang til for å fullføre denne "
  "sertifikat-forespørselen.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Nøkkel\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Nøkkel fra kort\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "feil under lesing av kort: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Kortets serienummer: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Tilgjengelige nøkler:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Mulige handlinger for %s-nøkler:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) signer, krypter\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) signer\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) krypter\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Skriv inn X.509-emnenavn: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Ingen emnenavn oppgitt\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Emneetikett «%.*s» er ugyldig\n"
@@@ -8380,74 -6654,57 +8408,74 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Emnenavnet «%s» er ugyldig\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "12"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Skriv inn e-postadresser"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (avslutt med tom linje):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Skriv inn DNS-navn"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (valgfritt. Avslutt med tom linje):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Skriv inn adresser"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Vil du lage selvsignert sertifikat? (y/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Følgende parametre brukes:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Lager selvsignert sertifikat."
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Lager sertifikatforespørsel.  "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "Dette kan ta en stund …\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Ferdig.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Ferdig. Du kan nå sende denne forespørselen til aktuell sertifikatutsteder "
  "(CA).\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "ressursproblem: oppbrukt kjerne\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(dette er algoritme RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(dette ser ikke ut som en kryptert melding)\n"
  
@@@ -8580,7 -6806,6 +8608,7 @@@ msgstr "|FIL|legg til nøkkelknippe i l
  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:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
  
@@@ -8662,17 -6871,14 +8690,17 @@@ msgstr "feil under lagring av sertifika
  msgid "basic certificate checks failed - not imported\n"
  msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "feil under henting av lagrede valg: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "feil under importering av sertifikat: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "feil under lesing av inndata: %s\n"
@@@ -8741,7 -6936,6 +8769,7 @@@ msgstr "
  "\n"
  "%s%sEr du sikker på at du vil gjøre dette?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8760,161 -6953,132 +8788,167 @@@ msgstr "
  "«%s»\n"
  "Merk: dette sertifikatet lager ikke «kvalifiserte» signaturer."
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "kontrollsum-algoritme %d (%s) for undertegnet %d støttes ikke. Bruker %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "kontrollsum-algoritme brukt av undertegnet %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Signatur fullført"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[dato ikke oppgitt]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
  "attributt for utregnet sum\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Gyldig signatur fra"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                også kjent som"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Dette er en godkjent signatur\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "klarte ikke å starte låsing av sertifikat-hurtiglager: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "klarte ikke å sperre sertifikat-hurtiglager for lesing: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "klarte ikke å sperre sertifikat-hurtiglager for skriving: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "klarte ikke å låse opp sertifikat-hurtiglager: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "fjerner %u sertifikater fra hurtiglager\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "klarte ikke å tolke sertifikat «%s»: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "sertifikat «%s» ligger allerede i hurtiglager\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "lastet inn tillitsmerket sertifikat «%s»\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "lastet inn sertifikat «%s»\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  SHA1-fingeravtrykk = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "   utsteder ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "  emne ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "feil under innlasting av sertifikat «%s»: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "permanent innlastede sertifikater: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "    hurtiglagrede sertifikater: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "    hurtiglagrede sertifikater: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "sertifikat allerede hurtiglagret\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "sertifikat hurtiglagret\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "feil under hurtiglagring av sertifikat: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "feil under henting av sertifikat etter S/N: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "feil under henting av sertifikat etter emne: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "fant ingen utsteder av sertifikat\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
@@@ -8949,7 -7107,6 +8983,7 @@@ msgstr "fjerner hurtiglager-fil «%s»\
  msgid "not removing file '%s'\n"
  msgstr "lar være å fjerne «%s»\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "feil under lukking av hurtiglager-fil: %s\n"
@@@ -9172,7 -7285,6 +9206,7 @@@ msgstr "S/N %s er gyldig, men står ikk
  msgid "error getting data from cache file: %s\n"
  msgstr "feil under henting av data fra hurtiglager-fil: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "«%s» er en ugyldig summeringsalgoritme\n"
@@@ -9186,12 -7296,10 +9220,12 @@@ msgstr "«gcry_md_open» for algoritme 
  msgid "got an invalid S-expression from libksba\n"
  msgstr "fikk ugyldig S-uttrykk fra libksba\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "konvertering av S-uttrykk mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "oppretting av S-uttrykk mislyktes: %s\n"
@@@ -9239,83 -7338,67 +9273,83 @@@ msgstr "finner CRL-utstedersertifikat m
  msgid "CRL signature verification failed: %s\n"
  msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "feil under kontroll av gyldighet for CRL-utstedersertifikat: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "ksba_crl_new mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "ksba_crl_set_reader mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "fjernet ødelagt midlertidig hurtiglager-fil «%s»\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "feil under fjerning av ødelagt midlertidig hurtiglager-fil «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "feil under opprettelse av midlertidig hurtiglager-fil «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "crl_parse_insert mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "feil under ferdigstillelse av midlertidig hurtiglager-fil «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "feil under lukking av midlertidig hurtiglager-fil «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "ADVARSEL: ny CRL er fremdeles for gammel (utgått %s). Laster inn likevel\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "ny CRL er fremdeles for gammel (utgått %s)\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "%s er en ukjent kritisk CRL-utvidelse\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "feil under lesing av CRL-utvidelser: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "lager hurtiglager-fil «%s»\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "klarte ikke å endre navn på «%s» til «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9323,12 -7406,10 +9357,12 @@@ msgstr "
  "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
  "programmet starter\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "Start CRL-utskrift (hentet via %s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
@@@ -9336,53 -7417,42 +9370,53 @@@ msgstr "
  " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
  "oppdatering.\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr " FEIL: CRL blir ikke brukt fordi en kritisk utvidelse er ukjent.\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " FEIL: CRL blir ikke brukt\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr " FEIL: Huriglagret CRL kan ha blitt endret av uvedkommende.\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " ADVARSEL: ugyldig lengde på oppføring i hurtiglager\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "klarte ikke å lese hurtiglager-oppføring: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "klarte ikke å lese hurtiglager-nøkkel: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "feil under lesing av hurtiglager-oppføring fra db: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Avslutt CRL-utskrift\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "crl_fetch via DP mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "crl_cache_insert via DP mislyktes: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
@@@ -9391,47 -7460,35 +9425,47 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "tilknytningstabell for overføring fra leser til fil er full. Venter\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "bruker «http» i stedet for «https»\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "feil under innlasting av leserobjekt: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "for mange videresendinger\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "feil under henting av «%s»: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "feil under henting av «%s»: http-status %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "Ingen CRL-tilgang i Tor-modus\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "sertifikatsøk ikke tilgjengelig fordi %s er slått av\n"
@@@ -9571,113 -7599,85 +9605,113 @@@ msgstr "forventet fullstendig filsti\n
  msgid "looking up '%s'\n"
  msgstr "slår opp «%s»\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "vis innhold i CRL-hurtiglager"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|ADR|hent CRL fra valgt nettADResse"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "slå av dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "tøm hurtiglager"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "kjør uten å spørre bruker"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "tving innlasting av utdatert CRL"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "tillat sending av OCSP-forespørsler"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "hindre bruk av HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "hindre bruk av LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignorer HTTP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignorer LDAP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  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:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP-svartjeneste signert av FPR"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  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:223
++#: dirmngr/dirmngr.c:225
  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:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "kjør all nettverkstrafikk gjennom Tor"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9686,11 -7686,9 +9720,11 @@@ msgstr "
  "@\n"
  "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9698,77 -7696,60 +9732,77 @@@ msgstr "
  "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
  "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "bruk: %s [valg] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "kolon tillates ikke i sokkelnavn\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "henting av CRL fra «%s» mislyktes: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: lesefeil: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, 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:1776
  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:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM mottatt. Slår av …\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "slår av under tvang\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT mottatt. Slår av umiddelbart\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -9998,35 -7931,28 +10032,35 @@@ msgstr "vertsnavn inneholder ugyldig te
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "legger til «%s:%d» i ldap-tjenerliste\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "malloc mislyktes: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "fant ugyldig generelt S-uttrykk\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "«gcry_md_open» mislyktes: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "obs: «ksba_cert_hash» mislyktes: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "oppdaget ugyldig URL-koding\n"
  
@@@ -10058,243 -7978,187 +10092,239 @@@ msgstr "feil under endring av OCSP-mål
  msgid "error building OCSP request: %s\n"
  msgstr "feil under bygging av OCSP-forespørsel: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "feil under tilkobling til «%s»: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "feil under lesing av HTTP-svar for «%s»: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "feil under tolking av OCSP-svar for «%s»: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "Status for OCSP-svartjeneste ved «%s»: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "summering av OCSP-svar for «%s» mislyktes: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "OSCP-svar skal bare bruke SHA-1\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "tildeling av listeelement mislyktes: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "feil under henting av svartjeneste-ID: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "fant ikke utstedersertifikat: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "klient sendte ikke målsertifikat\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "klient sendte ikke utstedersertifikat\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "ingen forvalgt OCSP-svartjeneste\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "ingen OCSP-undertegner er definert som standard\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "bruker OCSP-svartjeneste «%s»\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "klarte ikke å sette opp kontrollsum-kontekst for OCSP: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "sertifikatstatus er: %s  (dette=%s  neste=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "bra"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "OCSP-svartjeneste sendte status datert i fremtid\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP-svartjeneste sendte for gammel status\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "ldapserver mangler"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "serienummer mangler i sertifikat-ID"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "«assuan_inquire» mislyktes: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "«fetch_cert_by_url» mislyktes: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "feil under sending av data: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "«start_cert_fetch» mislyktes: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "«fetch_next_cert» mislyktes: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d overskredet\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "klarte ikke å starte opp tjener: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan-godkjenningsproblem: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan-behandling mislyktes: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr "godtar rot-CA som ikke er merket som CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "for mange nivåer av CRL-kontroll\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "lar være å kontrollere CRL for"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "kontrollerer CRL for"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "selvsignert sertifikat har ugyldig signatur"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "troverdighetssjekk av rotsertifikat mislyktes: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "sertifikatkjede er funnet i orden\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA krever kontrollsum på 160 bit\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
  
@@@ -10389,198 -8232,151 +10419,198 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Oppsettsvalg"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "Nyttige feilsøkingsvalg"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Sikkerhetsvalg"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  "|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Valg som håndhever passordfrase-regler"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  #, fuzzy
  #| msgid "do not allow to bypass the passphrase policy"
  msgid "do not allow bypassing the passphrase policy"
  msgstr "ikke tillat overstyring av passordfrase-regler"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|endre minimal passordfrase-lengde til N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|regn passord som ugyldig etter N antall dager"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "ikke tillat gjenbruk av gamle passordfraser"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  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:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPES|sett opp e-post-alias"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Oppsett for nøkkeltjenere"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillat PKA-oppslag (DNS-forespørsler)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "slå av all tilgang til dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "ikke se etter rotsertifikater i CRL"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Valg som styrer utdata-format"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Valg som styrer grensesnitt og håndheving av regler"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Valg som styrer bruk av Tor"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Oppsett for HTTP-tjenere"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "bruk systemets innstilling for HTTP-mellomtjener"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Oppsett for bruk av LDAP-tjenere"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAP-tjenerliste"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Oppsett for OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "GPG for OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "Smartcard-bakgrunnsprosess"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "GPG for S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "nettverksfeil"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "Skriving av PIN og passordfrase"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Komponent egner seg ikke for oppstart"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern bekreftelse av komponent %s mislyktes"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error hashing '%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/pl.po
index d424d26,2559b48..20c107f
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,8 -8,7 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-2.0.20\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2013-05-12 17:25+0200\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
+ "PO-Revision-Date: 2017-02-22 16:03+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
  "Language: pl\n"
@@@ -19,7 -18,6 +19,7 @@@
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
  "|| n%100>=20) ? 1 : 2);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@@ -30,47 -28,38 +30,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Anuluj"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Anuluj"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "Wprowadź nowe hasło
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Jakość:"
  
@@@ -88,72 -76,56 +88,72 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Jakość wpisanego wyżej tekstu.\n"
  "Kryteria jakości można uzyskać od administratora."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr "Proszę wprowadzić swój PIN, żeby odblokować klucz tajny dla tej sesji"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
  "Proszę wprowadzić swoje hasło, żeby odblokować klucz tajny dla tej sesji"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Hasło:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "nie pasują - proszę spróbować jeszcze raz"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (próba %d z %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN zbyt długi"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Hasło zbyt długie"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Niewłaściwy znak w PIN-ie"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN zbyt krótki"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Niepoprawny PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Niepoprawne hasło"
  
@@@ -162,52 -133,38 +162,60 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, 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"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "błąd pobierania numeru seryjnego karty: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "wykryto kartę o numerze seryjnym: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "błąd pobierania domyślnego keyID uwierzytelnienia karty: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "nie znaleziono pasującego klucza karty: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "błąd pobierania zapisanych flag: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -215,24 -172,19 +223,24 @@@
  msgstr ""
  "Proces ssh zarządał użycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwolić na to?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Zgoda"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Odmowa"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Proszę wprowadzić hasło dla klucza ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Proszę ponownie wprowadzić to hasło"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -241,68 -193,53 +249,68 @@@ msgstr "
  "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
  "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "PIN administracyjny"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Kod resetujący"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0ADo wpisywania należy użyć klawiatury czytnika."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Powtórz ten kod resetujący"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Powtórz ten PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Powtórz ten PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "błąd tworzenia pliku tymczasowego: %s\n"
@@@ -410,47 -333,32 +418,47 @@@ msgstr "
  "@Opcje:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "uruchomienie w trybie serwera"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "wyjście poleceń w stylu sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "wyjście poleceń w stylu csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "nie odczepianie od konsoli"
  
@@@ -531,11 -422,6 +539,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
  
@@@ -557,48 -441,35 +565,48 @@@ msgstr "
  "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
  "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, 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:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "nie można utworzyć gniazda: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
@@@ -608,29 -478,23 +616,29 @@@ msgstr "nazwa gniazda `%s' zbyt długa\
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "błąd podczas pobierania nonce z gniazda\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() nie powiodło się: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
@@@ -662,7 -520,6 +670,7 @@@ msgstr "stat() nie powiodło się dla ,
  msgid "can't use '%s' as home directory\n"
  msgstr "nie można użyć ,,%s'' jako katalogu domowego\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "błąd odczytu nonce z fd %d: %s\n"
@@@ -687,13 -540,11 +695,13 @@@ msgstr "obsługa ssh 0x%lx dla fd %d ur
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s zatrzymany\n"
@@@ -716,8 -563,6 +724,8 @@@ msgstr "
  "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
  "Utrzymuwanie pamięci haseł\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -725,9 -570,6 +733,9 @@@ msgstr "
  "@Polecenia:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -781,8 -615,6 +789,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -849,8 -672,6 +857,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Tak"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nie"
  
@@@ -903,7 -717,6 +911,7 @@@ msgstr "Zmiana hasła
  msgid "I'll change it later"
  msgstr "Zmienię je później"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -911,13 -724,11 +919,13 @@@
  "%%0A?"
  msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "włączenie klucza do użycia"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -938,7 -746,6 +946,7 @@@ msgstr "Klucz %s używa niebezpieczneg
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
@@@ -965,23 -768,15 +973,23 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "błąd tworzenia potoku: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  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:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "błąd podczas tworzenia procesu: %s\n"
@@@ -997,8 -790,6 +1005,8 @@@ msgstr "oczekiwanie na zakończenie pro
  msgid "error running '%s': probably not installed\n"
  msgstr "błąd uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
@@@ -1010,13 -800,11 +1018,13 @@@ msgstr "błąd uruchamiania ,,%s'': ko
  msgid "error running '%s': terminated\n"
  msgstr "błąd uruchamiania ,,%s'': zakończono\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "błąd odczytu kodu zakończenia procesu %d: %s\n"
@@@ -1241,8 -983,6 +1249,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "nieobsługiwany algorytm: %s"
@@@ -1363,7 -1076,10 +1371,12 @@@ msgstr "zignorowano błędną linię
  msgid "[none]"
  msgstr "[brak]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "nieoczekiwany argument"
  
@@@ -1432,7 -1134,6 +1445,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "brak pamięci\n"
  
@@@ -1495,8 -1185,6 +1508,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
@@@ -1664,8 -1319,6 +1677,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1325,9 +1686,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Twój wybór? "
  
@@@ -1742,17 -1375,11 +1755,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "błąd odczytu ,,%s'': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
@@@ -1813,7 -1427,6 +1826,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
@@@ -1852,13 -1460,10 +1865,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrąglono do %u bitów\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
@@@ -1918,9 -1513,6 +1931,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Niewłaściwy wybór.\n"
  
@@@ -2048,23 -1611,15 +2061,23 @@@ msgstr "Niepoprawne polecenie  (spróbu
  msgid "--output doesn't work for this command\n"
  msgstr "opcja --output nie działa z tym poleceniem\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1668,6 +2138,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "błąd podczas tworzenia hasła: %s\n"
@@@ -2166,7 -1702,6 +2179,7 @@@ msgstr "
  "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2292,39 -1803,30 +2305,39 @@@ msgstr "usunięcie jak największej cz�
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: pominięty: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "zapis do ,,%s''\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "klucz %s: zawartość klucza na karcie - pominięto\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "eksport kluczy tajnych nie jest dozwolony\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "klucz %s: klucz PGP 2.x - pominięty\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2602,7 -2043,6 +2615,7 @@@ msgstr "|N|ustawienie poziomu kompresj
  msgid "use canonical text mode"
  msgstr "kanoniczny format tekstowy"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|PLIK|zapis wyjścia do PLIKU"
  
@@@ -2817,475 -2229,377 +2830,479 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nieznana opcja ,,%s''\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "niezrozumiały URL serwera kluczy\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  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:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "sprawdzanie podpisów z danymi PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "Niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Nie wolno używać %s z %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nie ma sensu w połączeniu z %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "wybrany algorytm kompresji jest niepoprawny\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "wartość completes-needed musi być większa od 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "wartość marginals-needed musi być większa od 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "niewłaściwe domyślne ustawienia\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "niewłaściwe ustawienia szyfrów\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "niewłaściwe ustawienia skrótów\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s jeszcze nie działa z %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "eksport kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "opakowywanie ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Wpisz tutaj swoją wiadomość ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|PLIK|pobieranie kluczy ze zbioru PLIK"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "nie traktować konfliktu datowników jako błędu"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|pisanie opisu stanu do deskryptora FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Wywołanie: gpgv [opcje] [pliki] (-h podaje pomoc)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4638,14 -3687,9 +4655,14 @@@ msgstr "
  "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
  "dopóki program nie zostanie uruchomiony ponownie.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "unieważniony"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "wygasł"
  
@@@ -4685,7 -3723,6 +4702,7 @@@ msgstr "Czy dalej chcesz je dodać? (t/
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
  
@@@ -4718,7 -3749,6 +4735,7 @@@ msgstr[2] "%d podpis usunięty.\n
  msgid "Nothing deleted.\n"
  msgstr "Nic nie zostało usunięte.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "niepoprawny"
  
@@@ -4959,73 -3941,57 +4976,73 @@@ msgstr "
  "Wyświetlanie zdjęcia w formacie %s o rozmiarze %ld bajtów dla klucza %s (id "
  "%d).\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "ustawienie ,,%s'' powtarza się\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "zbyt wiele ustawień szyfru\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "zbyt wiele ustawień funkcji skrótu\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "zbyt wiele ustawień kompresji\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "zapis podpisu bezpośredniego\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "zapis podpisu klucza nim samym\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "zapis podpisu wiążącego klucz\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, 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:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Podpisywanie"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certyfikowanie"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Szyfrowanie"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Uwierzytelnianie"
  
@@@ -5039,158 -4005,127 +5056,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "PpSsUuZz"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Możliwe akcje dla klucza %s: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Aktualnie dopuszczalne akcje: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Przełączenie możliwości podpisywania\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Zakończenie\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Proszę wybrać rodzaj klucza:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA i RSA (domyślne)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamala (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Istniejący klucz\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Uchwyt klucza: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Brak klucza o tym uchwycie\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Jakiej długości podklucz wygenerować? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Jakiej długości klucz wygenerować? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Żądana długość klucza to %u bitów.\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5206,7 -4141,6 +5223,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5222,38 -4156,30 +5239,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Okres ważności klucza? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Okres ważności podpisu? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "niepoprawna wartość\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Klucz nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Podpis nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Klucz traci ważność %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Ważność podpisu wygasa %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5261,11 -4187,9 +5278,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Czy wszystko się zgadza (t/N)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5279,7 -4203,6 +5296,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5295,50 -4218,39 +5312,50 @@@ msgstr "
  "    \"Tadeusz Żeleński (Boy) <tzb at ziemianska.pl>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Imię i nazwisko: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  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:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Adres poczty elektronicznej: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "To nie jest poprawny adres poczty elektronicznej\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Komentarz: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Niewłaściwy znak w komentarzu\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5349,7 -4261,6 +5366,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
@@@ -5366,39 -4277,28 +5383,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "IiKkEeDdWw"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
- #, fuzzy
- #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
+ msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
  
- #: g10/keygen.c:2755
- #, fuzzy
- #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
- "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
+ "Zmienić (I)mię/nazwisko, adres (E)mail, przejść (D)alej,\n"
  "czy (W)yjść z programu? "
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Najpierw trzeba poprawić ten błąd\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5414,13 -4314,10 +5427,13 @@@ msgstr "
  "ilości\n"
  "entropii.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generacja klucza nie powiodła się: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5428,71 -4325,58 +5441,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "klucz już istnieje\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, 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:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "generowanie nowego klucza\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Procedura generacji klucza została anulowana.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5500,7 -4384,6 +5513,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5508,7 -4391,6 +5521,7 @@@ msgstr "
  "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
  "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5516,22 -4398,18 +5529,22 @@@ msgstr "
  "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
  "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Część tajna głównego klucza jest niedostępna.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Czy na pewno utworzyć? (t/N) "
  
@@@ -5615,13 -4477,11 +5628,13 @@@ msgstr "       Odcisk klucza =
  msgid "      Card serial no. ="
  msgstr "    Nr seryjny karty ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "buforowanie zbioru kluczy ,,%s''\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5630,7 -4490,6 +5643,7 @@@ msgstr[0] "%lu kluczy zbuforowano do te
  msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
  msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5638,7 -4497,6 +5651,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5647,7 -4505,6 +5660,7 @@@ msgstr[0] "1 niepoprawny podpis\n
  msgstr[1] "1 niepoprawny podpis\n"
  msgstr[2] "1 niepoprawny podpis\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: zbiór kluczy utworzony\n"
@@@ -5948,7 -4743,6 +5961,7 @@@ msgstr "binarny
  msgid "textmode"
  msgstr "tekstowy"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "nieznany"
  
@@@ -6175,61 -4927,50 +6188,61 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problem z agentem: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Hasło\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "anulowano przez użytkownika\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (ID głównego klucza %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Proszę wprowadzić hasło do odbezpieczenia obiektu PKCS#12."
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6664,18 -5322,15 +6677,18 @@@ msgstr "stary, nieobsługiwany algoryt
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algorytm szyfrujący %d%s jest nieznany lub został wyłączony\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "OSTRZEŻENIE: brak algorytmu szyfrującego %s w ustawieniach odbiorcy\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "UWAGA: ważność klucza tajnego %s wygasła %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6995,7 -5601,6 +7008,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "podpis %s/%s złożony przez: ,,%s''\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7003,11 -5608,9 +7016,11 @@@ msgstr "
  "OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "podpis:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "zostanie użyty szyfr %s\n"
@@@ -7069,19 -5661,16 +7082,19 @@@ msgstr "niewłaściwy odcisk
  msgid "ownertrust value missing"
  msgstr "brak wartości zaufania właściciela"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "błąd podczas szukania zapisu wartości zaufania w ,,%s'': %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "błąd odczytu w ,,%s'': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
@@@ -7117,7 -5700,6 +7130,7 @@@ msgstr "zbyt duże zlecenie dla bazy za
  msgid "%s: directory does not exist!\n"
  msgstr "%s: katalog nie istnieje!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7261,10 -5815,6 +7274,10 @@@ msgstr "błąd tworzenia pliku tymczaso
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7299,7 -5844,6 +7312,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7490,11 -6007,9 +7503,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7504,19 -6018,16 +7517,19 @@@
  msgid "resetting keydb: %s\n"
  msgstr "błąd zapisu klucza: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "błąd zapisywania flag: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "błąd tworzenia potoku: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
@@@ -7524,7 -6035,6 +7537,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
@@@ -7532,7 -6042,6 +7545,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
@@@ -7540,7 -6049,6 +7553,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
@@@ -7548,7 -6056,6 +7561,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
@@@ -7556,7 -6063,6 +7569,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
@@@ -7564,7 -6070,6 +7577,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
@@@ -7572,18 -6077,15 +7585,18 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d podpisów usuniętych.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7592,13 -6094,11 +7605,13 @@@ msgstr[0] "wypisanie skrótów wiadomo�
  msgstr[1] "wypisanie skrótów wiadomości"
  msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "zaszyfrowane za pomocą %lu haseł\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7607,31 -6107,25 +7620,31 @@@ msgstr[0] "wypisanie skrótów wiadomo�
  msgstr[1] "wypisanie skrótów wiadomości"
  msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "poprawność: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7649,19 -6143,15 +7662,19 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7711,52 -6192,42 +7724,52 @@@ msgstr "Można próbować odtworzyć ba
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "użycie modelu zaufania %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "sprawdzanie bazy jest niepotrzebne\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "następne sprawdzanie bazy odbędzie się %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "klucz publiczny %s nie odnaleziony: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "sprawdzanie bazy zaufania\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7765,7 -6236,6 +7778,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7774,16 -6244,13 +7787,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "brak absolutnie zaufanych kluczy\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7791,7 -6258,6 +7804,7 @@@ msgstr "
  "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
  "%du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7906,19 -6351,14 +7919,19 @@@ msgstr "
  "Składnia: kbxutil [opcje] [pliki]\n"
  "Wypisywanie, eksport, import danych Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 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"
@@@ -7971,7 -6402,6 +7984,7 @@@ 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:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
@@@ -7986,70 -6414,70 +7999,87 @@@ msgstr "nie powiódł się zapis odcisk
  msgid "failed to store the creation date: %s\n"
  msgstr "nie powiódł się zapis daty utworzenia: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "błąd podczas odczytu stanu CHV z karty\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "odpowiedź nie zawiera współczynnika RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "użycie domyślnego PIN-u jako %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Proszę wpisać PIN%%0A[podpisów wykonanych: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Proszę wpisać PIN"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "błąd podczas odczytu stanu CHV z karty\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "karta została trwale zablokowana!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -8063,25 -6491,19 +8093,24 @@@ msgstr[2] "
  "Zostało %d prób PIN-u administracyjnego do trwałego zablokowania karty\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Proszę wprowadzić PIN administracyjny"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Proszę wpisać PIN"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Proszę wprowadzić kod resetujący dla karty"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -8089,79 -6511,61 +8118,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nowy kod resetujący"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Nowy PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Proszę wprowadzić PIN i nowy PIN"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "błąd podczas odczytu danych aplikacji\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "błąd podczas odczytu odcisku DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "klucz już istnieje\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "istniejący klucz zostanie zastąpiony\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "generowanie nowego klucza\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "zapisywanie nowego klucza\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "brak datownika utworzenia\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nie powiódł się zapis klucza: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "nieobsługiwany algorytm: %s"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "proszę czekać na wygenerowanie klucza...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "generowanie klucza nie powiodło się\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8170,32 -6574,26 +8199,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "odcisk na karcie nie zgadza się z żądanym\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "dotychczas stworzono podpisów: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@@ -8215,53 -6610,41 +8244,53 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|PLIK|zapisanie logów do PLIKu"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|połączenie z czytnikiem na porcie N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAZWA|użycie NAZWY jako sterownika ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAZWA|użycie NAZWY jako sterownika PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "nie używanie wewnętrznego sterownika CCID"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|odłączenie karty po N sekundach nieaktywności"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "nie używanie klawiatury czytnika"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "zabronienie używania poleceń karty administratora"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, 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:288
++#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8280,22 -6662,14 +8309,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "obsługa fd %d uruchomiona\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "obsługa fd %d zakończona\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8314,12 -6685,10 +8338,12 @@@ msgstr "łańcuchowy
  msgid "shell"
  msgstr "powłokowy"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "krytyczne rozszerzenie certyfikatu %s nie jest obsługiwane"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "wystawca certyfikatu nie jest oznaczony jako CA"
  
@@@ -8333,13 -6700,11 +8357,13 @@@ msgstr "polityka oznaczona jako krytycz
  msgid "failed to open '%s': %s\n"
  msgstr "nie udało się otworzyć ,,%s'': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "uwaga: niekrytyczna polityka certyfikatu niedozwolona"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "polityka certyfikatu niedozwolona"
  
@@@ -8367,9 -6727,6 +8391,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8390,12 -6743,10 +8414,12 @@@ msgstr "proszę upewnić się, że ,,di
  msgid "checking the CRL failed: %s"
  msgstr "sprawdzenie CRL nie powiodło się: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certyfikat o nieważnej ważności: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "certyfikat jeszcze nie jest ważny"
  
@@@ -8407,7 -6756,6 +8431,7 @@@ msgstr "certyfikat główny jeszcze ni
  msgid "intermediate certificate not yet valid"
  msgstr "certyfikat pośredni jeszcze nie jest ważny"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "certyfikat wygasł"
  
@@@ -8456,7 -6793,6 +8480,7 @@@ msgstr "  (certyfikat ważny od 
  msgid "  (     issuer valid from "
  msgstr "  (     wystawca ważny od "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "odcisk=%s\n"
@@@ -8485,7 -6815,6 +8509,7 @@@ msgstr "nie znaleziono wystawcy w certy
  msgid "self-signed certificate has a BAD signature"
  msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "główny certyfikat nie jest oznaczony jako zaufany"
  
@@@ -8494,28 -6822,22 +8518,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "łańcuch certyfikatów zbyt długi\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "nie znaleziono wystawcy certyfikatu"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "certyfikat ma ZŁY podpis"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "znaleziono inny być może pasujący certyfikat CA - ponawianie próby"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "łańcuch certyfikatów dłuższy niż zezwala CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "certyfikat jest dobry\n"
  
@@@ -8541,11 -6858,9 +8565,11 @@@ msgstr "użyty model poprawności: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(to jest algorytm MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "brak"
  
@@@ -8579,37 -6889,29 +8603,37 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "stworzony %s, wygasa %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  "nie określono sposobu wykorzystania klucza - przyjęto wszystkie sposoby\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "błąd podczas pobierania informacji o wykorzystaniu klucza: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "certyfikat nie powinien być używany do poświadczania\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "certyfikat nie powinien być używany do szyfrowania\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "certyfikat nie powinien być używany do podpisywania\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "certyfikat nie nadaje się do szyfrowania\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "certyfikat nie nadaje się do podpisywania\n"
  
@@@ -8716,7 -7000,6 +8740,7 @@@ msgstr "linia %d: błąd pobierania klu
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "linia %d: generowanie klucza nie powiodło się: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8724,64 -7007,51 +8748,64 @@@ msgstr "
  "Aby zakończyć to żądanie certyfikatu proszę wprowadzić jeszcze raz hasło dla "
  "utworzonego klucza.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Istniejący klucz\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Istniejący klucz z karty\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "błąd odczytu karty: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Numer seryjny karty: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Dostępne klucze:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Możliwe akcje dla klucza %s:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) podpisywanie, szyfrowanie\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) podpisywanie\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) szyfrowanie\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Nazwa przedmiotu X.509: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Nie podano nazwy przedmiotu\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8792,80 -7062,63 +8816,80 @@@ msgstr "Nieprawidłowa etykieta nazwy p
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
  msgstr "Nieprawidłowa nazwa przedmiotu ,,%s''\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "33"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Adresy poczty elektronicznej"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (pusta linia oznacza koniec):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Nazwy DNS"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (opcjonalne; pusta linia oznacza koniec):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "URI"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
  msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
  msgstr "Tworzenie żądania certyfikatu. Może to chwilę potrwać...\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Gotowe. Teraz należy wysłać to żądanie do własnego centrum certyfikacji.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "problem z zasobami: brak pamięci\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(to jest algorytm RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
  
@@@ -9001,7 -7223,6 +9025,7 @@@ msgstr "|PLIK|dodanie tego zbioru klucz
  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:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
  
@@@ -9096,17 -7301,14 +9120,17 @@@ msgid "basic certificate checks failed 
  msgstr ""
  "podstawowe sprawdzenia certyikatu nie powiodły się - nie zaimportowany\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "błąd pobierania zapisanych flag: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "błąd importu certyfikatu: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "błąd odczytu wejścia: %s\n"
@@@ -9177,7 -7368,6 +9201,7 @@@ msgstr "
  "\n"
  "%s%sNa pewno chcesz to zrobić?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9196,181 -7385,152 +9220,187 @@@ msgstr "
  ",,%s''\n"
  "Należy zauważyć, że ten certyfikat NIE utworzy kwalifikowanego podpisu!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "algorytm skrótu %d (%s) dla podpisującego %d nie jest obsługiwany; użycie "
  "%s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "algorytm skrótu użyty dla podpisującego %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Podpisano w "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[nie podano daty]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " przy użyciu certyfikatu o ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr "błędny podpis: atrybut skrótu wiadomości nie zgadza się z obliczonym\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Poprawny podpis złożony przez"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                        alias"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "To jest podpis kwalifikowany\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "problem odszukaniem istniejącego certyfikatu: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
  msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "nie można utworzyć ,,%s'': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
  msgstr "certyfikat ,,%s'' usunięty\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
  msgstr "powtórzony certyfikat ,,%s'' usunięty\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
  msgstr "certyfikat ,,%s'' usunięty\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "odcisk=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
  msgstr "Dołączone certyfikaty"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
  msgstr "liczba pasujących certyfikatów: %d\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "number of matching certificates: %d\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "liczba pasujących certyfikatów: %d\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
  msgstr "  (certyfikat utworzony "
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate cached\n"
  msgstr "certyfikat jest dobry\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "niewłaściwy odcisk"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
  msgstr "nie znaleziono wystawcy w certyfikacie"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9412,7 -7566,6 +9442,7 @@@ msgstr "odbieranie linii nie powiodło 
  msgid "not removing file '%s'\n"
  msgstr "opakowywanie ASCII nie powiodło się: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9657,7 -7766,6 +9687,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "błąd pobierania zapisanych flag: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9672,13 -7778,11 +9702,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "iconv_open nie powiodło się: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9733,164 -7828,135 +9763,164 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
  msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "odczyt nie powiódł się: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "zapis zmian na kluczu prywatnym nie powiódł się: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "błąd zapisu do pliku tymczasowego: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
  msgstr "błąd odczytu wejścia: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
  msgstr "błąd tworzenia potoku: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid notation data found\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
  msgstr "błąd odczytu karty: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
  msgstr "błąd odczytu nonce z fd %d: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "odczyt nie powiódł się: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9900,54 -7965,42 +9930,54 @@@ msgstr "odbieranie linii nie powiodło 
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "zbyt wiele ustawień szyfru\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
  msgstr "błąd odtwarzania ,,%s'' poprzez %s: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
  msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate search not possible due to disabled %s\n"
@@@ -10113,127 -8137,99 +10143,127 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, 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:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKu"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Wyjść bez zapisania zmian? (t/N) "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|PLIK|odczyt opcji z PLIKU"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|używaj serwera kluczy URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10246,13 -8242,11 +10276,13 @@@ msgstr "
  "@\n"
  "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, 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:363
++#: dirmngr/dirmngr.c:383
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10264,88 -8258,71 +10294,88 @@@ msgstr "
  "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
  "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, 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:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "wywołanie: gpgsm [opcje]"
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "nie wymuszono"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10601,40 -8530,33 +10631,40 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "wysyłanie klucza %s na serwer %s %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
  msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: niewłaściwa wersja pliku %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
  msgstr "iconv_open nie powiodło się: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "zapis zmian na kluczu prywatnym nie powiódł się: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10672,287 -8588,231 +10702,283 @@@ msgstr "błąd zapisywania flag: %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "błąd odczytu ,,%s'': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
  msgstr "błąd zapisu do ,,%s'': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "błąd odczytu z %s: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
  msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
  msgstr "odbieranie linii nie powiodło się: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  #, fuzzy
  #| msgid "certificate should not have been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
  msgstr "nie znaleziono wystawcy certyfikatu"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
  msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
  msgstr "błąd zapisywania certyfikatu\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "nie udało się przydzielić uchwytu keyDB\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "nie można dostać się do ,,%s'': %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "brak domyślnego zbioru kluczy tajnych: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
  msgstr "użycie domyślnego PIN-u jako %s\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "szyfrem %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "certyfikat został unieważniony"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "wysyłanie linii nie powiodło się: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "wysyłanie linii nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "złożenie podpisu nie powiodło się: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
  msgstr "wystawca certyfikatu nie jest oznaczony jako CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "sprawdzanie bazy zaufania\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
  msgstr "sprawdzenie CRL nie powiodło się: %s"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
  msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
  msgstr "certyfikat jest dobry\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  #, fuzzy
  #| msgid "certificate should not have been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
@@@ -11060,197 -8899,150 +11086,197 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Opcje sterujące konfiguracją"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "Opcje przydatne do diagnostyki"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Opcje sterujące bezpieczeństwem"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|przedawnienie kluczy SSH po N sekundach"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Opcje wymuszające politykę haseł"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "nie zezwalanie na pominięcie polityki haseł"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|przedawnianie haseł po N dniach"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "nie zezwalanie na ponowne użycie starych haseł"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|określ adres email"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Konfiguracja dla serwerów kluczy"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|używaj serwera kluczy URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "zablokuj dostęp do dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "nie sprawdzanie CRL dla głównych certyfikatów"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Opcje sterujące formatem wyjścia"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Opcje sterujące interaktywnością i wymuszaniem"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Opcje sterujące bezpieczeństwem"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguracja dla serwerów HTTP"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "użycie systemowego ustawienia proxy HTTP"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguracja używanych serwerów LDAP"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "lista serwerów LDAP"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Konfiguracja dla OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Niepoprawne hasło"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Nie znaleziono komponentu"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Uwaga, określenia grup są ignorowane\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/pt.po
index 81a19bc,1be33e1..8571756
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -18,7 -17,6 +18,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@@ -29,40 -27,31 +29,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "frase-secreta inválida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -80,75 -68,59 +80,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Por favor digite a frase secreta \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "frase secreta incorrecta"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "frase secreta demasiado longa\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "frase secreta demasiado longa\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Caracter inválido no nome\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI incorreto"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "frase secreta incorrecta"
@@@ -158,150 -129,115 +158,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "impossível abrir `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Por favor digite a frase secreta \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muda a frase secreta"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Por favor digite a frase secreta \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Repita a frase secreta: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Repita a frase secreta: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Repita a frase secreta: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
@@@ -386,48 -308,33 +393,48 @@@ msgstr "
  "Opções:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "A chave foi substituída"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -514,11 -404,6 +521,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -534,47 -417,34 +541,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossível criar %s: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -584,28 -453,22 +591,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -632,7 -489,6 +639,7 @@@ msgstr "base de dados de confiança: le
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: impossível criar directoria: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -657,12 -509,10 +664,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ignorado: %s\n"
@@@ -684,8 -530,6 +691,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -537,6 +700,9 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -749,8 -582,6 +756,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -809,8 -631,6 +816,8 @@@ msgstr "
  msgid "Yes"
  msgstr "sim"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -861,19 -674,16 +868,19 @@@ msgstr "muda a frase secreta
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "activa uma chave"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -893,7 -700,6 +900,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
@@@ -920,22 -722,14 +927,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: 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"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -950,8 -742,6 +957,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -961,12 -750,10 +968,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@@ -1194,8 -935,6 +1201,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1331,7 -1043,10 +1338,12 @@@ msgstr "erro na última linha\n
  msgid "[none]"
  msgstr "versão desconhecida"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "caracter radix64 inválido %02x ignorado\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -1407,7 -1108,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "não processado"
@@@ -1466,8 -1155,6 +1478,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1636,8 -1290,6 +1648,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1298,10 +1659,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Opção? "
  
@@@ -1722,17 -1354,11 +1734,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -1799,7 -1412,6 +1811,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@@ -1830,13 -1437,10 +1842,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arredondado para %u bits\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1485,6 +1903,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Opção inválida.\n"
  
@@@ -2028,23 -1590,15 +2040,23 @@@ msgstr "Comando inválido (tente \"help
  msgid "--output doesn't work for this command\n"
  msgstr "--output não funciona para este comando\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1648,6 +2118,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
@@@ -2145,7 -1680,6 +2157,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2271,40 -1781,31 +2283,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ignorado: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "a escrever para `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: nada exportado\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2589,7 -2029,6 +2601,7 @@@ msgstr "
  msgid "use canonical text mode"
  msgstr "usar modo de texto canônico"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
@@@ -2770,476 -2181,378 +2782,480 @@@ msgstr "AVISO: permissões pouco segura
  msgid "unknown configuration item '%s'\n"
  msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostrar em que porta-chave a chave está"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Endereço eletrónico inválido\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, 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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, 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:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s sobrepõe %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s não é permitido com %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve ser maior que 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve ser maior que 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  #, 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:3737
++#: g10/gpg.c:3741
  #, 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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferências por omissão inválidas\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferências pessoais de cifra inválidas\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferências pessoais de 'digest' inválidas\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferências pessoais de compressão inválidas\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, 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:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifragem falhou: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "retirada de armadura falhou: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Digite a sua mensagem ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  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:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "Remover esta chave do porta-chaves?"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  #, fuzzy
  msgid "make timestamp conflicts only a warning"
  msgstr "conflito de \"timestamp\""
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr ""
  "|DF|escrever informações de estado para o\n"
  "descritor de ficheiro DF"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  #, fuzzy
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4592,15 -3640,10 +4608,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "revkey"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4639,7 -3676,6 +4655,7 @@@ msgid "You may not add a photo ID to a 
  msgstr ""
  "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4671,7 -3701,6 +4687,7 @@@ msgstr[1] "%d assinatura removida.\n
  msgid "Nothing deleted.\n"
  msgstr "Nada removido.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "armadura inválida"
@@@ -4913,74 -3894,58 +4929,74 @@@ msgid "Displaying %s photo ID of size %
  msgstr ""
  "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "a escrever a assinatura directa\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "a escrever a auto-assinatura\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "a escrever a assinatura ligada a uma chave\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "tamanho de chave inválido; a utilizar %u bits\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamanho da chave arredondado para %u bits\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar dados"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -4994,157 -3959,126 +5010,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notação de assinatura: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "O tamanho de chave pedido é %u bits\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5160,7 -4094,6 +5176,7 @@@ msgstr "
  "      <n>m = chave expira em n meses\n"
  "      <n>y = chave expira em n anos\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5176,40 -4109,32 +5192,40 @@@ msgstr "
  "      <n>m = assinatura expira em n meses\n"
  "      <n>y = assinatura expira em n anos\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "A chave é valida por? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "A assinatura é valida por? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valor inválido\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s expira em %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5217,12 -4142,10 +5233,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Está correto (s/n)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5233,7 -4156,6 +5249,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5251,50 -4173,39 +5267,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nome completo: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Caracter inválido no nome\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  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:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome deve ter pelo menos 5 caracteres\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Endereço de correio eletrónico: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Endereço eletrónico inválido\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Comentário: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Caracter inválido no comentário\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5305,7 -4216,6 +5321,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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 "
@@@ -5322,35 -4232,28 +5338,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoSs"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primeiro o erro\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5362,13 -4265,10 +5378,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5376,68 -4276,55 +5392,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "%s' já comprimido\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Geração de chave cancelada.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossível criar `%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "chaves pública e privada criadas e assinadas.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5446,7 -4333,6 +5462,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5454,7 -4340,6 +5470,7 @@@ msgstr "
  "a chave foi criada %lu segundo no futuro\n"
  "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5462,22 -4347,18 +5478,22 @@@ msgstr "
  "a chave foi criada %lu segundos no futuro\n"
  "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Realmente criar? "
@@@ -5560,26 -4425,22 +5576,26 @@@ msgstr "  Impressão da chave =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "a verificar o porta chaves `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu chave verificadas (%lu assinaturas)\n"
  msgstr[1] "%lu chave verificadas (%lu assinaturas)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5587,7 -4448,6 +5603,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 assinatura incorrecta\n"
  msgstr[1] "1 assinatura incorrecta\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: porta-chaves criado\n"
@@@ -5890,7 -4688,6 +5906,7 @@@ msgstr "primary
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  #, fuzzy
  msgid "unknown"
  msgstr "versão desconhecida"
@@@ -6110,55 -4865,44 +6126,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "subpacote do tipo %d tem bit crítico ligado\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema com o agente: o agente returnou 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Insira a frase secreta\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "cancelado pelo utilizador\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (ID principal da chave %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Por favor digite a frase secreta \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Por favor digite a frase secreta \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Por favor digite a frase secreta \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Por favor digite a frase secreta \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6590,17 -5251,14 +6606,17 @@@ msgstr "codificação antiga do DEK nã
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritmo de cifra %d%s é desconhecido ou foi desactivado\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: chave secreta %08lX expirou em %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6893,7 -5502,6 +6909,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6901,11 -5509,9 +6917,11 @@@ msgstr "
  "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
  "destinatário\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "a assinar:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "será utilizada a cifragem %s\n"
@@@ -6967,17 -5562,14 +6983,17 @@@ msgstr "%s: versão de ficheiro inváli
  msgid "ownertrust value missing"
  msgstr "importar os valores de confiança"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "armadura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de dados de confiança: sincronização falhou: %s\n"
@@@ -7011,7 -5597,6 +7027,7 @@@ msgstr "transação de base de dados d
  msgid "%s: directory does not exist!\n"
  msgstr "%s: diretoria inexistente!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "impossível fechar `%s': %s\n"
@@@ -7154,10 -5711,6 +7170,10 @@@ msgstr "erro na criação da frase secr
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
@@@ -7189,7 -5737,6 +7205,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
@@@ -7360,11 -5880,9 +7376,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7373,120 -5890,100 +7389,120 @@@
  msgid "resetting keydb: %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d assinaturas removidas.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  msgid "Encrypted 0 messages."
  msgstr "Repita a frase secreta\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Política: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7503,18 -6000,14 +7519,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7566,81 -6050,66 +7582,81 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  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:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "chave pública %08lX não encontrada: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "a verificar a base de dados de confiança\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  #, 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:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7752,19 -6200,14 +7768,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7813,7 -6247,6 +7829,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 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"
@@@ -7828,69 -6259,67 +7844,84 @@@ msgstr "falha ao inicializar a base de 
  msgid "failed to store the creation date: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7899,27 -6328,22 +7930,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "muda a frase secreta"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "muda a frase secreta"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "motivo da revocação: "
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7927,117 -6351,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "%s' já comprimido\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI não suportado"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@@ -8058,57 -6455,45 +8089,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NOME|usar NOME como destinatário por omissão"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NOME|usar NOME como destinatário por omissão"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "nunca usar o terminal"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "comandos em conflito\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8118,22 -6502,14 +8149,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter radix64 inválido %02x ignorado\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "o gpg-agent não está disponível nesta sessão\n"
@@@ -8152,12 -6525,10 +8178,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8170,12 -6539,10 +8196,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "impossível abrir `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -8203,9 -6565,6 +8229,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8228,12 -6583,10 +8254,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8246,7 -6597,6 +8272,7 @@@ msgstr "a escrever chave privada para `
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Esta chave expirou!"
@@@ -8302,7 -6641,6 +8328,7 @@@ msgstr "certificado incorrecto
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "mostra impressão digital"
@@@ -8332,7 -6664,6 +8358,7 @@@ msgstr "gerar um certificado de revoga�
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8341,29 -6671,23 +8367,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verificar uma assinatura"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "preferência %c%lu duplicada\n"
@@@ -8392,11 -6711,9 +8418,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "não"
@@@ -8434,36 -6746,28 +8460,36 @@@ msgstr "
  "\"%.*s\"\n"
  "chave %u bits %s, ID %08lx, criada %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8557,71 -6843,57 +8583,71 @@@ msgstr "erro ao criar porta-chaves `%s'
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "A geração de chaves falhou: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (apenas assinatura)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "desactiva uma chave"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (assinatura e cifragem)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritmo de dispersão inválido `%s'\n"
@@@ -8631,82 -6903,65 +8657,82 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Endereço de correio eletrónico: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Insira o identificador do utilizador. Termine com uma linha vazia: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Digite novo nome de ficheiro"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr ""
  "\n"
  "Insira o identificador do utilizador. Termine com uma linha vazia: "
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  msgid "Now creating certificate request.  "
  msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8850,7 -7074,6 +8876,7 @@@ msgstr "
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
@@@ -8938,17 -7145,14 +8964,17 @@@ msgstr "gerar um certificado de revoga�
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -9012,7 -7205,6 +9038,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9026,168 -7217,138 +9052,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "algoritmo de protecção %d%s não é suportado\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Assinatura correcta de \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                   ou \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Isto será uma auto-assinatura.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "impossível criar `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "mostra impressão digital"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificado incorrecto"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "erro na criação da frase secreta: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "gerar um certificado de revogação"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
@@@ -9223,7 -7378,6 +9254,7 @@@ msgstr "remoção do bloco de chave fal
  msgid "not removing file '%s'\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -9448,7 -7558,6 +9479,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9463,12 -7570,10 +9494,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "impossível abrir %s: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
@@@ -9517,149 -7613,120 +9548,149 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verificação de assinatura suprimida\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "%s: impossível criar directoria: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "%s: impossível criar directoria: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "a escrever para `%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
  "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? problema ao verificar revogação: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "actualização falhou: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
@@@ -9668,50 -7734,38 +9699,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "demasiadas preferências `%c'\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "erro ao criar `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "chave `%s' não encontrada: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "chave `%s' não encontrada: %s\n"
@@@ -9864,116 -7889,88 +9895,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Sair sem gravar? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9986,91 -7983,72 +10017,91 @@@ msgstr "
  "@\n"
  "(Veja a página man para uma lista completa de comandos e opções)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opções] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "não processado"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10312,38 -8242,31 +10343,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "a procurar por \"%s\" no servidor HKP %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "impossível abrir %s: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "actualização da chave secreta falhou: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10376,254 -8293,198 +10407,250 @@@ msgstr "erro na leitura de `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "chave `%s' não encontrada: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "gerar um certificado de revogação"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: impossível aceder: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "sem porta-chaves público por omissão: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "NOTA: a chave foi revogada"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossível criar `%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "a verificar a base de dados de confiança\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verificar uma assinatura"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "preferência %c%lu duplicada\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10720,195 -8560,148 +10747,195 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|usar mode de frase secreta N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "erro na criação da frase secreta: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifrar para NOME"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, 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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "erro na rede"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "frase secreta incorrecta"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "chave pública não encontrada"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "erro na leitura de `%s': %s\n"
diff --cc po/ro.po
index 78782d9,7c7f7f3..95fd35d
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -19,7 -18,6 +19,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "am eşuat să stochez amprenta: %s\n"
@@@ -30,41 -28,32 +30,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "frază-parolă invalidă
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  #, fuzzy
  msgid "Quality:"
  msgstr "validitate: %s"
@@@ -83,17 -71,14 +83,17 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
@@@ -101,58 -86,45 +101,58 @@@
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "frază-parolă incorectă"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "linie prea lungă"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "frază-parolă prea lungă\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Caracter invalid în nume\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI incorect"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "frază-parolă incorectă"
@@@ -162,77 -133,57 +162,84 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "nu pot deschide `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "nu am găsit nici un inel de chei secret de scris: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "schimbă fraza-parolă"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -240,80 -191,65 +247,80 @@@
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 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:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  "Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
  "   %.*s\n"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  #, fuzzy
  msgid "Admin PIN"
  msgstr "|A|PIN Admin"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Repetaţi acest PIN: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Repetaţi acest PIN: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Repetaţi acest PIN: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, fuzzy, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
@@@ -398,48 -320,33 +405,48 @@@ msgstr "
  "Opţiuni:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Cheia este înlocuită"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -524,11 -414,6 +531,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -544,47 -427,34 +551,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -594,28 -463,22 +601,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "scriu cheia secretă în `%s'\n"
@@@ -644,7 -501,6 +651,7 @@@ msgstr "fstat(%d) a eşuat în %s: %s\n
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: nu pot crea director: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -669,12 -521,10 +676,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "actualizarea secretului a eşuat: %s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: sărită: %s\n"
@@@ -696,8 -542,6 +703,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -705,9 -549,6 +712,9 @@@ msgstr "
  "@Comenzi:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -764,8 -597,6 +771,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "eroare în `%s': %s\n"
@@@ -824,8 -646,6 +831,8 @@@ msgstr "
  msgid "Yes"
  msgstr "da"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -876,7 -689,6 +883,7 @@@ msgstr "schimbă fraza-parolă
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -884,13 -696,11 +891,13 @@@
  "%%0A?"
  msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "activează cheia"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -910,7 -717,6 +917,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
@@@ -937,22 -739,14 +944,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -967,8 -759,6 +974,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -978,12 -767,10 +985,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@@ -1211,8 -952,6 +1218,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1349,7 -1061,10 +1356,12 @@@ msgstr "eroare linia de trailer\n
  msgid "[none]"
  msgstr "[nesetat(ă)]"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "caracter radix64 invalid %02X sărit\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "Nu sunt permise comenzi administrare\n"
@@@ -1425,7 -1126,6 +1437,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "neforţat(ă)"
@@@ -1484,8 -1173,6 +1496,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1653,8 -1307,6 +1665,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1314,10 +1675,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Selecţia d-voastră? "
  
@@@ -1733,17 -1365,11 +1745,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -1803,7 -1416,6 +1815,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@@ -1834,13 -1441,10 +1846,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rotunjită prin adaos la %u biţi\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
@@@ -1899,9 -1493,6 +1911,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Selecţie invalidă.\n"
  
@@@ -2027,23 -1589,15 +2039,23 @@@ msgstr "Comandă invalidă  (încercaţ
  msgid "--output doesn't work for this command\n"
  msgstr "--output nu merge pentru această comandă\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1647,6 +2117,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
@@@ -2145,7 -1680,6 +2157,7 @@@ msgstr "
  "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
  "destinatarului\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2275,39 -1785,30 +2287,39 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: sărită: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "scriu în `%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "exportul cheilor secrete nu este permis\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "cheia %s: cheie stil PGP 2.x - sărită\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTISMENT: nimic exportat\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2586,7 -2026,6 +2598,7 @@@ msgstr "|N|setează nivel de compresie 
  msgid "use canonical text mode"
  msgstr "foloseşte modul text canonic"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
@@@ -2800,474 -2211,376 +2812,478 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, 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:1949
++#: g10/gpg.c:1951
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "opţiune necunoscută `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Nu este o adresă de email validă\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opţiuni import invalide\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "opţiuni import invalide\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opţiuni export invalide\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "opţiuni export invalide\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nu pot seta cale-execuţie ca %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVERTISMENT: %s înlocuieşte %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s nu este permis cu %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nu are sens cu %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritm cifrare selectat este invalid\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritm compresie selectat este invalid\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritm rezumat certificare selectat este invalid\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed trebuie să fie mai mare decât 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "preferinţe implicite invalide\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "preferinţe cifrare personale invalide\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "preferinţe rezumat personale invalide\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "preferinţe compresie personale invalide\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s nu merge încă cu %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "am eşuat să iniţializez TrustDB:%s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "trimitere server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "recepţie server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export cheie eşuat: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "căutare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "actualizare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "eliminarea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "punerea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL-ul politicii de certificare furnizat este invalid\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL-ul politicii de semnături furnizat este invalid\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "ia cheile de pe acest inel de chei"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "dă numai un avertisment la conflicte de timestamp"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|scrie informaţii de stare în acest FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Folosire: gpgv [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4598,14 -3646,9 +4614,14 @@@ msgstr "
  "corectă dacă nu reporniţi programul.\n"
  
  #
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "revocată"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "expirată"
  
@@@ -4645,7 -3682,6 +4661,7 @@@ msgstr "Sunteţi încă sigur(ă) că d
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4677,7 -3707,6 +4693,7 @@@ msgstr[1] "Am şters %d semnături.\n
  msgid "Nothing deleted.\n"
  msgstr "Nu am şters nimic.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "invalid(ă)"
  
@@@ -4922,71 -3903,55 +4938,71 @@@ msgstr "Subcheia %s este deja revocată
  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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "prea multe preferinţe de cifrare\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "prea multe preferinţe de rezumat\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "prea multe preferinţe de compresie\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "scriu semnătură directă\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "scriu auto semnătură\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "scriu semnătură legată de cheie\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "lungime cheie invalidă; folosesc %u biţi\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "lungime cheie rotunjită la %u biţi\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Semnează"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Cifrează"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Autentifică"
  
@@@ -5000,158 -3965,127 +5016,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsCcAaTt"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Acţiuni posibile pentru o cheie %s: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Acţiuni permise curent: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Comută capabilitatea de semnare\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Comută capabilitatea de cifrare\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Comută capabilitatea de autentificare\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminat\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Selectaţi ce fel de cheie doriţi:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (numai semnare)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (numai cifrare)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (2) Cheie de cifrare\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notare semnătură: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Lungimea cheii necesară este %u biţi\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5167,7 -4101,6 +5183,7 @@@ msgstr "
  "      <n>m = cheia expiră în n luni\n"
  "      <n>y = cheia expiră în n ani\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5183,38 -4116,30 +5199,38 @@@ msgstr "
  "      <n>m = semnătura expiră în n luni\n"
  "      <n>y = semnătura expiră în n ani\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Cheia este validă pentru? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Semnătura este validă pentru? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "valoare invalidă\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Cheia nu expiră deloc\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Semnătura nu expiră deloc\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Cheia expiră pe %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Semnătura expiră pe %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5222,11 -4147,9 +5238,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Este aceasta corect? (d/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5237,7 -4160,6 +5253,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5254,50 -4176,39 +5270,50 @@@ msgstr "
  "    \"Popa Ioan (popică) <popa.ioan at compania.ro>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Nume real: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Caracter invalid în nume\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Numele nu poate începe cu o cifră\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  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:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Adresă de email: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Nu este o adresă de email validă\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Comentariu: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Caracter invalid în comentariu\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5308,7 -4219,6 +5324,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5323,35 -4233,28 +5339,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoTt"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5363,13 -4266,10 +5379,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generarea cheii a eşuat: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5377,71 -4277,58 +5393,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "cheia există deja\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Generarea cheii a fost anulată.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "cheile secretă şi publică au fost create şi semnate.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5451,7 -4338,6 +5467,7 @@@ msgstr "
  "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
  "pentru acest scop.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5459,7 -4345,6 +5475,7 @@@ msgstr "
  "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5467,21 -4352,17 +5483,21 @@@ msgstr "
  "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Creaţi într-adevăr? (d/N) "
  
@@@ -5562,13 -4427,11 +5578,13 @@@ msgstr "      Amprentă cheie =
  msgid "      Card serial no. ="
  msgstr "      Card nr. serie ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "pun în cache inelul de chei `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5576,14 -4439,12 +5592,14 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "%lu chei puse în cache până acum (%lu semnături)\n"
  msgstr[1] "%lu chei puse în cache până acum (%lu semnături)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5591,7 -4452,6 +5607,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 semnătură incorectă\n"
  msgstr[1] "1 semnătură incorectă\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: inelul de chei creat\n"
@@@ -5892,7 -4690,6 +5908,7 @@@ msgstr "binar
  msgid "textmode"
  msgstr "modtext"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "necunoscut"
  
@@@ -6115,61 -4870,50 +6131,61 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "subpachetul de tip %d are bitul critic setat\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Introduceţi fraza-parolă\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "anulată de utilizator\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (ID cheie principală %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr ""
  "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6606,20 -5267,17 +6622,20 @@@ msgstr "vechea encodare a lui DEK nu es
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "AVERTISMENT: algoritm cifrare %s nu a fost găsit în preferinţele "
  "destinatarului\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTĂ: cheia secretă %s a expirat la %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6922,7 -5531,6 +6938,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s semnătură de la: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6930,11 -5538,9 +6946,11 @@@ msgstr "
  "AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
  "destinatarului\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "semnare:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "va fi folosită cifrarea %s\n"
@@@ -6994,19 -5589,16 +7010,19 @@@ msgstr "amprentă invalidă
  msgid "ownertrust value missing"
  msgstr "lipseşte valorea încrederii în proprietari (ownertrust)"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "eroare găsire înregistrare încredere în `%s': %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "eroare citire în `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sincronizarea a eşuat: %s\n"
@@@ -7042,7 -5628,6 +7058,7 @@@ msgstr "tranzacţia trustdb prea mare\n
  msgid "%s: directory does not exist!\n"
  msgstr "%s: directorul nu există!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7186,10 -5743,6 +7202,10 @@@ msgstr "eroare la crearea frazei-parol�
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
@@@ -7221,7 -5769,6 +7237,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "eroare în `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
@@@ -7394,11 -5914,9 +7410,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7407,121 -5924,101 +7423,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Am şters %d semnături.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "cifrată cu %lu fraze-parolă\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Politica: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7538,18 -6035,14 +7554,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7599,52 -6083,42 +7615,52 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "folosesc model de încredere %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "nu e nevoie de o verificare trustdb\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "următoarea verificare trustdb programată pe %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "cheia publică %s nu a fost găsită: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "vă rugăm faceţi un --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "verific trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7652,7 -6126,6 +7668,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7660,23 -6133,19 +7676,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "nu am găsit nici o cheie cu încredere supremă\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7790,19 -6238,14 +7806,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "apelul PIN a returnat eroare: %s\n"
@@@ -7851,7 -6285,6 +7867,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
@@@ -7866,69 -6297,67 +7882,84 @@@ msgstr "am eşuat să stochez amprenta
  msgid "failed to store the creation date: %s\n"
  msgstr "am eşuat să stochez data creării: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "eroare la recuperarea stării CHV de pe card\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "răspunsul nu conţine modulul RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "răspunsul nu conţine exponentul public RSA\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "răspunsul nu conţine datele cheii publice\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "verificarea CHV%d a eşuat: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "eroare la recuperarea stării CHV de pe card\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "cardul este încuiat permanent!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7940,27 -6369,22 +7971,27 @@@ msgstr[1] "
  "%d încercări PIN Admin rămase înainte de a încuia cardul permanent\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, 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:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "accesul la comenzile de administrare nu este configurată\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
+ 
++#: scd/app-openpgp.c:2619
  #, 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:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -7968,82 -6392,64 +7999,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|PIN Admin Nou"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|PIN Nou"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, 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:2570
++#: scd/app-openpgp.c:2725
  #, 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:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "eroare la citirea datelor aplicaţiei\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "eroare la citirea amprentei DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "cheia există deja\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "cheia existentă va fi înlocuită\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "timestamp-ul de creare lipseşte\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "am eşuat să stochez cheia: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI nesuportat"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  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:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "generarea cheii a eşuat\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8051,31 -6457,25 +8082,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "semnături create până acum: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@@ -8097,57 -6494,45 +8128,57 @@@ msgstr "|N|PIN Nou
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NUME|foloseşte NUME ca destinatar implicit"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NUME|foloseşte NUME ca destinatar implicit"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "nu folosi deloc terminalul"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "arată comenzi administrare"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8157,22 -6541,14 +8188,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter radix64 invalid %02X sărit\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@@ -8191,12 -6564,10 +8217,12 @@@ msgstr "
  msgid "shell"
  msgstr "ajutor"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "gpg-agent versiune protocol %d nu este suportat\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8209,12 -6578,10 +8235,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "Nu pot deschide `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "exportul cheilor secrete nu este permis\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "exportul cheilor secrete nu este permis\n"
@@@ -8242,9 -6604,6 +8268,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8267,12 -6622,10 +8293,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8285,7 -6636,6 +8311,7 @@@ msgstr "exportul cheilor secrete nu est
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Această cheie a expirat!"
@@@ -8342,7 -6681,6 +8368,7 @@@ msgstr "certificat incorect
  msgid "  (     issuer valid from "
  msgstr "      Card nr. serie ="
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Amprenta CA: "
@@@ -8372,7 -6704,6 +8398,7 @@@ msgstr "generează un certificat de rev
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8381,29 -6711,23 +8407,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifică o semnătură"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "preferinţa `%s' duplicată\n"
@@@ -8432,11 -6751,9 +8458,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "nu"
@@@ -8473,36 -6785,28 +8499,36 @@@ msgstr "
  "\"%.*s\"\n"
  "cheia %u-bit %s, ID %s, creată %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8597,72 -6883,58 +8623,72 @@@ msgstr "eroare la crearea inelului de c
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Generarea cheii a eşuat: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (numai semnare)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (2) Cheie de cifrare\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: eroare citire înregistrare liberă: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "deactivează cheia"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, fuzzy, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Acţiuni posibile pentru o cheie %s: "
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (semnare şi cifrare)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Nici o descriere dată)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritm hash invalid `%s'\n"
@@@ -8672,83 -6944,66 +8698,83 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "Adresă de email: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Introduceţi ID-ul utilizator.  Terminaţi cu o linie nouă: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Introduceţi un nou nume-fişier"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  #, fuzzy
  msgid "Enter URIs"
  msgstr "Introduceţi PIN: "
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Certificat de revocare creat.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8891,7 -7115,6 +8917,7 @@@ msgstr "adaugă acest inel de chei la l
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
@@@ -8980,17 -7187,14 +9006,17 @@@ msgstr "generează un certificat de rev
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -9054,7 -7247,6 +9080,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9068,167 -7259,137 +9094,172 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Semnătură făcută %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Semnătură bună din \"%s\""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                aka \"%s\""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr "Aceasta va fi o auto-semnătură.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Certificat de revocare creat.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Amprenta CA: "
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificat incorect"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Certificat de revocare creat.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "amprentă invalidă"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "generează un certificat de revocare"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
@@@ -9265,7 -7420,6 +9296,7 @@@ msgstr "citirea cheii publice a eşuat
  msgid "not removing file '%s'\n"
  msgstr "punerea armurii a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "eroare în `%s': %s\n"
@@@ -9494,7 -7604,6 +9525,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9511,12 -7618,10 +9542,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "răspuns invalid de la agent\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "nu pot deschide fişierul: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
@@@ -9567,114 -7663,92 +9598,114 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verificare semnătură eliminată\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "nu pot crea directorul `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "actualizarea secretului a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
@@@ -9682,36 -7756,29 +9713,36 @@@ msgstr "
  "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
  "folosită\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: eroare citire înregistrare liberă: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? probleme la verificare revocării: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "actualizarea a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
@@@ -9720,51 -7786,39 +9751,51 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "prea multe preferinţe de cifrare\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "eroare la creearea `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
@@@ -9918,118 -7943,90 +9949,118 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, 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:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
  #
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10042,95 -8039,76 +10073,95 @@@ msgstr "
  "@\n"
  "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "folosire: gpg [opţiuni] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "amprentă invalidă"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "neforţat(ă)"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10379,38 -8309,31 +10410,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "trimit cheia %s serverului %s %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: versiune fişier invalidă %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "nu pot deschide fişierul: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "actualizarea secretului a eşuat: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10444,257 -8361,201 +10475,253 @@@ msgstr "eroare la citire `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "citirea cheii publice a eşuat: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "generează un certificat de revocare"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "am eşuat să stochez cheia: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: nu pot accesa: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "nici un inel de chei secrete implicit: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "folosesc cifrul %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "NOTĂ: cheia a fost revocată"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "semnarea a eşuat: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "semnarea a eşuat: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "semnarea a eşuat: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "verific trustdb\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verifică o semnătură"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "preferinţa `%s' duplicată\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA necesită folosirea unui algoritm cu hash de 160 biţi\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10791,194 -8631,147 +10818,194 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|foloseşte modul frază-parolă N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NUME|cifrare pentru NUME"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
  #
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "eroare reţea"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "frază-parolă incorectă"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "cheia publică nu a fost găsită"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "eroare în `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/ru.po
index dc1a996,8d3776e..d8fc0af
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,8 -11,7 +11,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GnuPG 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2016-11-18 15:44+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
+ "PO-Revision-Date: 2017-01-24 17:17+0000\n"
  "Last-Translator: Ineiev <ineiev at gnu.org>\n"
  "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
  "Language: ru\n"
@@@ -22,7 -21,6 +22,7 @@@
  "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
  "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "сбой при блокировке для ввода пароля: %s\n"
@@@ -33,45 -31,35 +33,45 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|Отмена (_C)"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|Да (_Y)"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|Нет (_N)"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Показывать фразу-пароль"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Скрывать фразу-пароль"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Стойкость:"
  
@@@ -81,72 -69,56 +81,72 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
  "критериях оценки стойкости."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
  "Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Фраза-пароль:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "не подходит - попробуйте еще раз"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (попытка %d из %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Повторите:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "Слишком длинный PIN"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Слишком длинная фраза-пароль"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Недопустимый символ в PIN"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "Слишком короткий PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Неверный PIN"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Неверная фраза-пароль"
  
@@@ -155,49 -126,35 +155,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не могу открыть '%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "ошибка получения серийного номера карты: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "обнаружена карта, серийный номер: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "на карте нет основного аутентификационного ключа для ssh: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "на карте не найдено подходящего ключа: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "ошибка получения сохраненных признаков: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -206,24 -163,19 +214,24 @@@ msgstr "
  "Процесс ssh запросил доступ к ключу%%0A  %s%%0A  (%s)%%0AВы хотите это "
  "позволить?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Позволить"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Отказать"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Введите фразу-пароль для ключа ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Повторите фразу-пароль:"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -232,68 -184,53 +240,68 @@@ msgstr "
  "Введите фразу-пароль для защиты полученного секретного ключа%%0A   %s%%0A   "
  "%s%%0Aвнутри хранилища ключей агента gpg"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "сбой создания потока из сокета: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Вставьте карту с серийным номером"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Удалите текущую карту и вставьте карту с серийным номером"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Административный PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "Код разблокировки PIN (PUK)"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Код сброса"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AВводите на клавиатуре считывателя."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Повторите код сброса"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Повторите ввод PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Повторите ввод PIN"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Код сброса повторен неверно; попробуйте еще раз"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK повторен неверно; попробуйте еще раз"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN повторен неверно; попробуйте еще раз"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Введите PIN%s%s%s для доступа к карте"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "ошибка создания временного файла: %s\n"
@@@ -382,45 -305,30 +390,45 @@@ msgstr "
  "@Параметры:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "запуск в режиме демона (фоновый режим)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "запуск в режиме сервера (нефоновый режим)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  msgid "run in supervised mode"
  msgstr "запуск в подконтрольном режиме"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "сократить подробности"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "вывод команд в стиле sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "вывод команд в стиле csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "не отсоединяться от консоли"
  
@@@ -496,11 -387,6 +504,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
  
@@@ -516,43 -400,30 +524,43 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
  "Управление секретными ключами для @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "запрошен недопустимый уровень отладки '%s'\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметров '%s': %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "чтение параметров из '%s'\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Замечание: '%s' не считается параметром\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не могу создать сокет: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "слишком длинное имя сокета '%s'\n"
@@@ -561,27 -431,21 +569,27 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "ошибка получения разового кода для сокета\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "ошибка связывания сокета с '%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не удалось задать права доступа для '%s': %s\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "сбой listen(): %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "слушаем сокет '%s'\n"
@@@ -608,7 -466,6 +616,7 @@@ msgstr "сбой stat() для '%s': %s
  msgid "can't use '%s' as home directory\n"
  msgstr "невозможно использовать '%s' как домашний каталог\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
@@@ -633,12 -486,10 +641,12 @@@ msgstr "обработчик ssh 0x%lx 
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s остановлен\n"
@@@ -661,8 -508,6 +669,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
  "Работа с буфером паролей\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -670,9 -515,6 +678,9 @@@ msgstr "
  "@Команды:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -726,8 -560,6 +734,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "ошибка открытия '%s': %s\n"
@@@ -787,8 -610,6 +795,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Да"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Нет"
  
@@@ -841,26 -655,22 +849,26 @@@ msgstr "Сменить фразу-па�
  msgid "I'll change it later"
  msgstr "Сменю позже"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Вы действительно хотите удалить ключ с кодом%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Удалить ключ"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  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"
+ "Внимание: этот ключ также находится в списке для применения с 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"
  
@@@ -874,7 -682,6 +882,7 @@@ msgstr "%s ключ используе�
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu-битный хеш недопустим для %u-битного ключа %s\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "сбой проверки созданной подписи: %s\n"
@@@ -898,22 -701,14 +906,22 @@@ msgstr "алгоритм защиты %
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "хеш-функция защиты %d (%s) не поддерживается\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "ошибка при создании канала конвейера: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "ошибка при создании потока для канала конвейера: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "ошибка при дублировании процесса: %s\n"
@@@ -928,8 -721,6 +936,8 @@@ msgstr "сбой при ожидани�
  msgid "error running '%s': probably not installed\n"
  msgstr "ошибка выполнения '%s': возможно, не установлен\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "ошибка выполнения '%s': статус завершения %d\n"
@@@ -939,12 -729,10 +947,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "ошибка выполнения '%s': прервано\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "сбой при ожидании завершения процесса: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "ошибка получения кода возврата процесса %d: %s\n"
@@@ -973,20 -756,15 +981,18 @@@ msgstr "Внимание: небезо�
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
  
 +#: common/sysutils.c:693
- #, fuzzy, c-format
- #| msgid "waiting for the agent to come up ... (%ds)\n"
+ #, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
- msgstr "ожидаю подключения агента ... (%iс)\n"
+ msgstr "ожидаю доступности файла '%s'\n"
  
 +#: common/sysutils.c:719
- #, fuzzy, c-format
- #| msgid "error renaming '%s' to '%s': %s\n"
+ #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
- msgstr "ошибка переименования '%s' в '%s': %s\n"
+ msgstr "сбой при переименовании '%s' в '%s': %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "да|yes"
  
@@@ -1159,8 -899,6 +1165,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "алгоритм (не поддерживается): %s"
@@@ -1280,7 -991,10 +1286,12 @@@ msgstr "игнорируем дефек
  msgid "[none]"
  msgstr "[отсутствует]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "недопустимый символ radix64 %02x пропущен\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "неожиданный параметр"
  
@@@ -1346,7 -1046,6 +1357,7 @@@ msgstr "параметр \"%.50s\" не
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда \"%.50s\" неоднозначна\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "нехватка выделенной памяти\n"
  
@@@ -1404,8 -1092,6 +1415,8 @@@ msgstr "блокировка '%s' не 
  msgid "waiting for lock %s...\n"
  msgstr "ожидаю снятия блокировки %s...\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@@ -1439,11 -1118,9 +1450,11 @@@ msgstr "вложенные тексто
  msgid "unexpected armor: "
  msgstr "неожиданный текстовый формат: "
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "недопустимая строка, выделенная дефисами: "
+ msgstr "недопустимая строка с выключенными дефисами: "
  
 +#: g10/armor.c:873 g10/armor.c:1493
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
  msgstr "недопустимый символ radix64 %02X (игнорируется)\n"
@@@ -1560,8 -1213,6 +1571,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "в пакетном режиме это действие невозможно\n"
  
@@@ -1569,14 -1219,9 +1580,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Эта команда доступна только для карт версии 2.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Ваш выбор? "
  
@@@ -1616,15 -1252,12 +1627,15 @@@ msgstr "Ошибка: Нельзя ис
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Ошибка: Двойные пробелы недопустимы.\n"
  
 +#: 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"
@@@ -1638,16 -1269,10 +1649,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "ошибка чтения '%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "ошибка записи '%s': %s\n"
@@@ -1708,7 -1320,6 +1719,7 @@@ msgstr "операция с ключо�
  msgid "not an OpenPGP card"
  msgstr "это не карта OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "ошибка при считывании информации ключа: %s\n"
@@@ -1742,13 -1348,10 +1753,13 @@@ msgstr "Какой Вам нужен р
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "размер ключей %s должен быть в пределах %u-%u\n"
@@@ -1802,9 -1395,6 +1813,9 @@@ msgstr "   (2) Ключ шифрова�
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ аутентификации\n"
  
 +#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Неправильный выбор.\n"
  
@@@ -1849,11 -1429,9 +1860,11 @@@ msgstr "показать данную �
  msgid "list all available data"
  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 получения ключа"
  
@@@ -1869,11 -1444,9 +1880,11 @@@ msgstr "изменить имя уче�
  msgid "change the language preferences"
  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 "сменить отпечаток удостоверяющего центра"
  
@@@ -1925,22 -1486,14 +1936,22 @@@ msgstr "Недопустимая ком
  msgid "--output doesn't work for this command\n"
  msgstr "--output для данной команды не работает\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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"
@@@ -1950,11 -1502,9 +1961,11 @@@
  msgid "key \"%s\" not found\n"
  msgstr "ключ \"%s\" не найден\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(если только Вы не задали ключ отпечатком)\n"
+ msgstr "(если только ключ не задан отпечатком)\n"
  
 +#: g10/delkey.c:135
  msgid "can't do this in batch mode without \"--yes\"\n"
  msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
  
@@@ -1997,7 -1538,6 +2008,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "ошибка при создании фразы-пароля: %s\n"
@@@ -2034,7 -1568,6 +2045,7 @@@ msgstr "
  "Внимание: принудительное использование симметричного шифра %s (%d)\n"
  "          нарушает предпочтения получателя\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2048,12 -1580,10 +2059,12 @@@ msgstr "
  "принудительное использование симметричного шифра %s (%d) нарушает "
  "предпочтения получателя\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s зашифровано для: \"%s\"\n"
+ msgstr "%s/%s зашифровано для пользователя \"%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 "нельзя использовать %s в режиме %s\n"
@@@ -2136,11 -1650,11 +2147,13 @@@ msgstr "Внимание: не мог�
  msgid "export signatures that are marked as local-only"
  msgstr "экспортировать подписи, помеченные как 'только локальные'"
  
 +#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
- msgstr "экспортировать атрибутные ID пользователя (обычно фотоидентификаторы)"
+ msgstr ""
+ "экспортировать атрибутные идентификаторы пользователя (обычно "
+ "фотоидентификаторы)"
  
 +#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
  
@@@ -2152,50 -1664,37 +2165,50 @@@ msgstr "удалить при эксп�
  msgid "remove as much as possible from key during export"
  msgstr "при экспорте удалить из ключа как можно больше"
  
 +#: g10/export.c:120
  msgid "use the GnuPG key backup format"
- msgstr ""
+ msgstr "пользоваться архивным форматом ключей GnuPG"
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "сохраняю в '%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "ключ %s: материал ключа на карте - пропущен\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "экспорт секретных ключей не разрешен\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "Внимание: нечего экспортировать\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
  
 +#: g10/getkey.c:257
  msgid "[User ID not found]"
- msgstr "[ID пользователя не найден]"
+ msgstr "[Идентификатор пользователя не найден]"
  
 +#: 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 "(проверьте аргумент параметра '%s')\n"
@@@ -2321,21 -1793,15 +2334,19 @@@ msgstr "создать новую па�
  msgid "quickly generate a new key pair"
  msgstr "быстро создать новую пару ключей"
  
 +#: g10/gpg.c:454
  msgid "quickly add a new user-id"
- msgstr "быстро добавить новый ID пользователя"
+ msgstr "быстро добавить новый идентификатор пользователя"
  
 +#: g10/gpg.c:459
  msgid "quickly revoke a user-id"
- msgstr "быстро отозвать ID пользователя"
+ msgstr "быстро отозвать идентификатор пользователя"
  
 +#: g10/gpg.c:462
- #, fuzzy
- #| msgid "quickly generate a new key pair"
  msgid "quickly set a new expiration date"
- msgstr "быстро создать новую пару ключей"
+ msgstr "быстро установить новый срок действия"
  
 +#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "создание полноценной пары ключей"
  
@@@ -2447,7 -1886,6 +2458,7 @@@ msgstr "|N|установить уро�
  msgid "use canonical text mode"
  msgstr "использовать канонический текстовый режим"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|выводить данные в файл FILE"
  
@@@ -2471,17 -1905,6 +2482,7 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. на странице man)\n"
  
 +#: 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,451 -2030,359 +2631,461 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "неизвестный элемент в файле настроек '%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "показать в списке ключей фотоидентификаторы"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "показать в списке ключей сведения о назначении ключа"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "показать в списке подписей URL правил"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "показать в списке подписей все замечания"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "показать в списке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "показать в списке подписей пользовательские замечания"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показать в списке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
- msgstr "показать в списке ключей действительность ID пользователей"
+ msgstr ""
+ "показать в списке ключей действительность идентификаторов пользователей"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
- msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
+ msgstr ""
+ "показать в списке ключей отозванные и просроченные идентификаторы "
+ "пользователей"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показать в списке ключей отозванные и просроченные подключи"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "показать в списке ключей название таблицы ключей"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "показать в списке подписей сроки действия"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, c-format
  msgid "valid values for option '%s':\n"
  msgstr "недопустимые значения для параметра \"%s\"\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "неизвестные правила TOFU '%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" выведет список вариантов)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "недопустимое значения для параметра \"%s\"\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Замечание: %s не предназначен для нормального применения!\n"
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' - не допустимый срок действия подписи\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\" не является адресом электронной почты\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "недопустимый режим ввода пароля '%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' - не допустимая таблица символов\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "не могу интерпретировать URL сервера ключей\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "недопустимый параметр фильтра: %s\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: недопустимые параметры списка\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "недопустимые параметры списка\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "показать при проверке подписи фотоидентификаторы"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "показать при проверке подписи URL правил"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "показать при проверке подписей все замечания"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "показать при проверке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "показать при проверке подписей пользовательские замечания"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
- msgstr "показать при проверке подписей действительность ID пользователей"
+ msgstr ""
+ "показать при проверке подписей действительность идентификаторов пользователей"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
- "показать при проверке подписей отозванные и просроченные ID пользователя"
+ "показать при проверке подписей отозванные и просроченные идентификаторы "
+ "пользователя"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
- msgstr "показать при проверке подписей только первичный ID пользователя"
+ msgstr ""
+ "показать при проверке подписей только первичный идентификатор пользователя"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "проверить подписи по данным PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "поднять доверие подписей по действительным данным PKA"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не могу определить путь запуска для %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "Внимание: возможно создание файла образа памяти!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Внимание: %s отменяет %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s с %s недопустимо!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s с %s не имеет смысла!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "Внимание: работаем с фальшивым системным временем: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не будет работать с небезопасной памятью из-за %s\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм шифрования\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм сжатия\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция для сертификации\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed должен быть больше 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed должен быть больше 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
  
- #: g10/gpg.c:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "недопустимые предпочтения по умолчанию\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "недопустимые личные предпочтения шифра\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "недопустимые личные предпочтения хеш-функции\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s пока не работает совместно с %s!\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "сбой инициализации таблицы доверия: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
  "ключом\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "сбой симметричного шифрования '%s': %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "сбой при отправке на сервер ключей: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "сбой при получении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "сбой при экспорте ключа: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "сбой при экспорте в виде ключа ssh: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "сбой при поиске на сервере ключей: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "сбой при обновлении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ошибка преобразования из текстового формата: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ошибка преобразования в текстовый формат: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "недопустимая хеш-функция '%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Пишите сообщение ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "заданный URL правил сертификации неверен\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "заданный URL правил подписи неверен\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "заданный URL предпочтительного сервера ключей неверен\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|взять ключи из файла таблицы ключей FILE"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "при несоответствии метки времени - только предупреждение"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|выводить информацию в файл с дескриптором FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|отвергать подписи, сделанные по данному алгоритму"
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Вызов: gpgv [параметры] [файлы] (-h для подсказки)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3127,13 -2424,9 +3138,11 @@@ msgstr "удалить после им�
  msgid "run import filters and export key immediately"
  msgstr "применить фильтры импорта и немедленно экспортировать ключ"
  
 +#: g10/import.c:179
- #, fuzzy
- #| msgid "assume input is in binary format"
  msgid "assume the GnuPG key backup format"
- msgstr "предполагаю, что входные данные в двоичном формате"
+ msgstr "ожидать ключи в архивном формате GnuPG"
  
 +#: g10/import.c:341 g10/import.c:583
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропущен блок типа %d\n"
@@@ -3158,12 -2447,10 +3167,12 @@@ msgstr "        пропущено кл
  msgid "      skipped new keys: %lu\n"
  msgstr "        пропущено новых ключей: %lu\n"
  
 +#: g10/import.c:678
  #, c-format
  msgid "          w/o user IDs: %lu\n"
- msgstr "           без ID пользователя: %lu\n"
+ msgstr "           без идентификатора пользователя: %lu\n"
  
 +#: g10/import.c:681 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                 импортировано: %lu"
@@@ -3173,12 -2459,10 +3182,12 @@@
  msgid "             unchanged: %lu\n"
  msgstr "                  неизмененных: %lu\n"
  
 +#: g10/import.c:687
  #, c-format
  msgid "          new user IDs: %lu\n"
- msgstr "         новых ID пользователя: %lu\n"
+ msgstr "         новых идентификаторов пользователя: %lu\n"
  
 +#: g10/import.c:689
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "               новых подключей: %lu\n"
@@@ -3218,21 -2495,18 +3227,21 @@@ msgstr "             не импорт�
  msgid "    signatures cleaned: %lu\n"
  msgstr "             очищено подписей: %lu\n"
  
 +#: g10/import.c:705
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr "     очищено ID пользователей: %lu\n"
+ msgstr "     очищено идентификаторов пользователей: %lu\n"
  
 +#: g10/import.c:1052
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  "Внимание: ключ %s содержит предпочтения для недоступных\n"
- "алгоритмов для следующих ID пользователей:\n"
+ "алгоритмов для следующих идентификаторов пользователей:\n"
  
 +#: g10/import.c:1094
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": предпочитает шифр %s\n"
@@@ -3262,12 -2531,10 +3271,12 @@@ msgid "you can update your preferences 
  msgstr ""
  "свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
  
 +#: g10/import.c:1397 g10/import.c:2185
  #, c-format
  msgid "key %s: no user ID\n"
- msgstr "ключ %s: нет ID пользователя\n"
+ msgstr "ключ %s: нет идентификатора пользователя\n"
  
 +#: g10/import.c:1403
  #, c-format
  msgid "key %s: %s\n"
  msgstr "ключ %s: %s\n"
@@@ -3281,17 -2546,15 +3290,18 @@@ msgstr "исключен фильтро
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ключ %s: повреждение подключа PKS исправлено\n"
  
 +#: g10/import.c:1452
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
+ msgstr ""
+ "ключ %s: принят без самозаверенного идентификатора пользователя \"%s\"\n"
  
 +#: g10/import.c:1462 g10/import.c:1493
  #, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "ключ %s: нет действительных ID пользователя\n"
+ msgstr "ключ %s: нет действительных идентификаторов пользователя\n"
  
 +#: g10/import.c:1464
  msgid "this may be caused by a missing self-signature\n"
  msgstr "может быть, из-за отсутствия самоподписи\n"
  
@@@ -3335,17 -2590,14 +3345,17 @@@ msgstr "ключ %s: оригиналь
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
  
 +#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
+ msgstr "ключ %s: \"%s\" 1 новый идентификатор пользователя\n"
  
 +#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
+ msgstr "ключ %s: \"%s\" %d новых идентификаторов пользователя\n"
  
 +#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ключ %s: \"%s\" 1 новая подпись\n"
@@@ -3375,17 -2622,14 +3385,17 @@@ msgstr "ключ %s: \"%s\" %d подп
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ключ %s: \"%s\" %d подписей очищено\n"
  
 +#: g10/import.c:1699
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
+ msgstr "ключ %s: \"%s\" %d идентификатор пользователя очищен\n"
  
 +#: g10/import.c:1702
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
+ msgstr "ключ %s: \"%s\" %d идентификаторов пользователя очищено\n"
  
 +#: g10/import.c:1725
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ключ %s: \"%s\" не изменен\n"
@@@ -3449,24 -2683,21 +3459,25 @@@ msgstr "ключ %s: недействи
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
  
 +#: g10/import.c:2487
  #, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "ключ %s: нет ID пользователя для подписи\n"
+ msgstr "ключ %s: нет идентификатора пользователя для подписи\n"
  
 +#: g10/import.c:2504
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
+ "ключ %s: алгоритм с открытым ключом у идентификатора пользователя \"%s\" не "
  "поддерживается\n"
  
 +#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
+ msgstr ""
+ "ключ %s: неправильная самоподпись на идентификаторе пользователя \"%s\"\n"
  
 +#: g10/import.c:2523 g10/import.c:2549 g10/import.c:2600
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
@@@ -3506,12 -2730,10 +3517,12 @@@ msgstr "ключ %s: неверный �
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ключ %s: удален многократный отзыв подключей\n"
  
 +#: g10/import.c:2659
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
+ msgstr "ключ %s: пропущен идентификатор пользователя \"%s\"\n"
  
 +#: g10/import.c:2683
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ключ %s: пропущен подключ\n"
@@@ -3541,12 -2758,11 +3552,13 @@@ msgstr "ключ %s: подпись п�
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
  
 +#: g10/import.c:2905
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
+ msgstr ""
+ "ключ %s: обнаружено дублирование идентификатора пользователя - объединены\n"
  
 +#: g10/import.c:2969
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
@@@ -3715,18 -2903,15 +3727,19 @@@ msgstr "
  "Введите домен, ограничивающий использование данной подписи, или пустую "
  "строку, если нет ограничений.\n"
  
 +#: g10/keyedit.c:1161
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
- msgstr "ID пользователя \"%s\" пропущен: это не текстовый ID.\n"
+ msgstr ""
+ "Идентификатор пользователя \"%s\" пропущен: это не текстовый идентификатор.\n"
  
 +#: g10/keyedit.c:1169
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "ID пользователя \"%s\" отозван."
+ msgstr "Идентификатор пользователя \"%s\" отозван."
  
 +#: 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) "
  
@@@ -3735,22 -2918,18 +3748,22 @@@
  msgid "  Unable to sign.\n"
  msgstr "  Не могу подписать.\n"
  
 +#: g10/keyedit.c:1197
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "Срок действия ID пользователя \"%s\" истек."
+ msgstr "Срок действия идентификатора пользователя \"%s\" истек."
  
 +#: g10/keyedit.c:1225
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "ID пользователя \"%s\" не самозаверен."
+ msgstr "Идентификатор пользователя \"%s\" не самозаверен."
  
 +#: g10/keyedit.c:1254
  #, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "ID пользователя \"%s\" можно подписать."
+ msgstr "Идентификатор пользователя \"%s\" можно подписать."
  
 +#: g10/keyedit.c:1256
  msgid "Sign it? (y/N) "
  msgstr "Подписать его? (y/N) "
  
@@@ -3933,15 -3076,12 +3946,15 @@@ msgstr "показать отпечат
  msgid "show the keygrip"
  msgstr "показать код ключа"
  
 +#: g10/keyedit.c:1875
  msgid "list key and user IDs"
- msgstr "вывести список ключей и ID пользователя"
+ msgstr "вывести список ключей и идентификаторов пользователя"
  
 +#: g10/keyedit.c:1877
  msgid "select user ID N"
- msgstr "выбрать ID пользователя N"
+ msgstr "выбрать идентификатор пользователя N"
  
 +#: g10/keyedit.c:1878
  msgid "select subkey N"
  msgstr "выбрать подключ N"
  
@@@ -3949,35 -3088,28 +3962,36 @@@
  msgid "check signatures"
  msgstr "проверка подписей"
  
 +#: g10/keyedit.c:1885
  msgid "sign selected user IDs [* see below for related commands]"
- msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
+ msgstr ""
+ "подписать выбранные идентификаторы пользователя [* описание команд см. ниже]"
  
 +#: g10/keyedit.c:1890
  msgid "sign selected user IDs locally"
- msgstr "локально подписать выбранные ID пользователя"
+ msgstr "локально подписать выбранные идентификаторы пользователя"
  
 +#: g10/keyedit.c:1891
  msgid "sign selected user IDs with a trust signature"
- msgstr "подписать выбранные ID пользователя подписью доверия"
+ msgstr "подписать выбранные идентификаторы пользователя подписью доверия"
  
 +#: g10/keyedit.c:1893
  msgid "sign selected user IDs with a non-revocable signature"
- msgstr "подписать выбранные ID пользователя без возможности отзыва"
+ msgstr "подписать выбранные идентификаторы пользователя без возможности отзыва"
  
 +#: g10/keyedit.c:1895
  msgid "add a user ID"
- msgstr "добавить ID пользователя"
+ msgstr "добавить идентификатор пользователя"
  
 +#: g10/keyedit.c:1897
  msgid "add a photo ID"
  msgstr "добавить фотоидентификатор"
  
 +#: g10/keyedit.c:1898
  msgid "delete selected user IDs"
- msgstr "удалить выбранные ID пользователя"
+ msgstr "удалить выбранные идентификаторы пользователя"
  
 +#: g10/keyedit.c:1901
  msgid "add a subkey"
  msgstr "добавить подключ"
  
@@@ -4001,19 -3128,15 +4015,19 @@@ msgstr "удалить выбранны
  msgid "add a revocation key"
  msgstr "добавить ключ отзыва"
  
 +#: g10/keyedit.c:1914
  msgid "delete signatures from the selected user IDs"
- msgstr "удалить подписи с выбранных ID пользователя"
+ msgstr "удалить подписи с выбранных идентификаторов пользователя"
  
 +#: g10/keyedit.c:1916
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "сменить срок действия ключа или выбранных подключей"
  
 +#: g10/keyedit.c:1918
  msgid "flag the selected user ID as primary"
- msgstr "пометить выбранный ID пользователя как первичный"
+ msgstr "пометить выбранный идентификатор пользователя как первичный"
  
 +#: g10/keyedit.c:1921
  msgid "list preferences (expert)"
  msgstr "список предпочтений (экспертам)"
  
@@@ -4021,20 -3143,18 +4035,22 @@@
  msgid "list preferences (verbose)"
  msgstr "список предпочтений (подробный)"
  
 +#: g10/keyedit.c:1924
  msgid "set preference list for the selected user IDs"
- msgstr "установить список предпочтений для выбранных ID пользователя"
+ msgstr ""
+ "установить список предпочтений для выбранных идентификаторов пользователя"
  
 +#: g10/keyedit.c:1927
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
- "установить URL предпочтительного сервера ключей для выбранных ID пользователя"
+ "установить URL предпочтительного сервера ключей для выбранных "
+ "идентификаторов пользователя"
  
 +#: g10/keyedit.c:1929
  msgid "set a notation for the selected user IDs"
- msgstr "установить замечание для выбранных ID пользователя"
+ msgstr "установить замечание для выбранных идентификаторов пользователя"
  
 +#: g10/keyedit.c:1931
  msgid "change the passphrase"
  msgstr "сменить фразу-пароль"
  
@@@ -4042,15 -3161,12 +4058,15 @@@
  msgid "change the ownertrust"
  msgstr "изменить уровень доверия владельцу"
  
 +#: g10/keyedit.c:1937
  msgid "revoke signatures on the selected user IDs"
- msgstr "отозвать подписи у выбранных ID пользователя"
+ msgstr "отозвать подписи у выбранных идентификаторов пользователя"
  
 +#: g10/keyedit.c:1939
  msgid "revoke selected user IDs"
- msgstr "отозвать выбранные ID пользователя"
+ msgstr "отозвать выбранные идентификаторы пользователя"
  
 +#: g10/keyedit.c:1942
  msgid "revoke key or selected subkeys"
  msgstr "отозвать ключ или выбранные подключи"
  
@@@ -4066,16 -3179,15 +4082,18 @@@ msgstr "отключить ключ
  msgid "show selected photo IDs"
  msgstr "показать выбранные фотоидентификаторы"
  
 +#: g10/keyedit.c:1949
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
- "сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
+ "сжать непригодные идентификаторы пользователей и удалить непригодные подписи "
+ "из ключа"
  
 +#: g10/keyedit.c:1951
  msgid "compact unusable user IDs and remove all signatures from key"
- msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
+ msgstr ""
+ "сжать непригодные идентификаторы пользователей и удалить все подписи из ключа"
  
 +#: g10/keyedit.c:2063
  msgid "Secret key is available.\n"
  msgstr "Секретный ключ доступен.\n"
  
@@@ -4098,19 -3207,17 +4116,21 @@@ msgstr "
  msgid "Key is revoked."
  msgstr "Ключ отозван."
  
 +#: g10/keyedit.c:2263
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Действительно подписать все ID пользователя? (y/N) "
+ msgstr "Действительно подписать все идентификаторы пользователя? (y/N) "
  
 +#: g10/keyedit.c:2267
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Действительно подписать все текстовые ID пользователя? (y/N) "
+ msgstr ""
+ "Действительно подписать все текстовые идентификаторы пользователя? (y/N) "
  
 +#: g10/keyedit.c:2275
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
+ msgstr ""
+ "Подсказка: Выберите идентификаторы пользователей, которые нужно подписать\n"
  
 +#: g10/keyedit.c:2286
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Неизвестный тип подписи '%s'\n"
@@@ -4120,26 -3226,22 +4140,27 @@@
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Данная команда в режиме %s недопустима.\n"
  
 +#: 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 "Вы должны выбрать хотя бы один идентификатор пользователя.\n"
  
 +#: 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:2337
  msgid "You can't delete the last user ID!\n"
- msgstr "Вы не можете удалить последний ID пользователя!\n"
+ msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
  
 +#: g10/keyedit.c:2340
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
+ msgstr ""
+ "Действительно удалить все выбранные идентификаторы пользователей? (y/N) "
  
 +#: g10/keyedit.c:2341
  msgid "Really remove this user ID? (y/N) "
- msgstr "Действительно удалить этот ID пользователя? (y/N) "
+ msgstr "Действительно удалить этот идентификатор пользователя? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
@@@ -4177,15 -3271,13 +4198,16 @@@ msgstr "Вы действительн�
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
  
 +#: g10/keyedit.c:2556
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
+ msgstr ""
+ "Действительно отозвать все выбранные идентификаторы пользователей? (y/N) "
  
 +#: g10/keyedit.c:2557
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Действительно отозвать данный ID пользователя? (y/N) "
+ msgstr "Действительно отозвать данный идентификатор пользователя? (y/N) "
  
 +#: g10/keyedit.c:2575
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
  
@@@ -4207,12 -3295,11 +4229,13 @@@ msgstr "
  msgid "Set preference list to:\n"
  msgstr "Установить предпочтения в:\n"
  
 +#: g10/keyedit.c:2698
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
+ "Действительно обновить предпочтения для выбранных идентификаторов "
+ "пользователей? (y/N) "
  
 +#: g10/keyedit.c:2700
  msgid "Really update the preferences? (y/N) "
  msgstr "Действительно обновить предпочтения? (y/N) "
  
@@@ -4249,26 -3328,20 +4272,25 @@@ msgstr "\"%s\" - не отпечато�
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" - не первичный отпечаток\n"
  
 +#: g10/keyedit.c:3249 g10/keyedit.c:3252
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
- msgstr "Недопустимый ID пользователя '%s': %s\n"
+ msgstr "Недопустимый идентификатор пользователя '%s': %s\n"
  
 +#: g10/keyedit.c:3255
  msgid "No matching user IDs."
- msgstr "Нет подходящих ID пользователей."
+ msgstr "Нет подходящих идентификаторов пользователей."
  
 +#: g10/keyedit.c:3255
  msgid "Nothing to sign.\n"
  msgstr "Подписывать нечего.\n"
  
 +#: g10/keyedit.c:3388
- #, fuzzy, c-format
- #| msgid "'%s' is not a valid signature expiration\n"
+ #, c-format
  msgid "'%s' is not a valid expiration time\n"
- msgstr "'%s' - не допустимый срок действия подписи\n"
+ msgstr "'%s' - не допустимый срок действия\n"
  
 +#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Хеш: "
  
@@@ -4288,11 -3357,10 +4310,12 @@@ msgstr "Предпочтительны�
  msgid "Notations: "
  msgstr "Замечания: "
  
 +#: g10/keyedit.c:3845
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
- msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
+ msgstr ""
+ "В идентификаторе пользователя типа PGP 2.x не может быть предпочтений.\n"
  
 +#: g10/keyedit.c:3917
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
@@@ -4361,14 -3416,9 +4384,14 @@@ msgstr "
  "Учтите, что показанная достоверность ключа может быть неверной,\n"
  "пока Вы не перезапустите программу.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "отозван"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "просрочен"
  
@@@ -4378,11 -3427,10 +4401,11 @@@ 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 пользователя, помеченного как первичный. Эта команда может\n"
- "          привести к тому, что первичным станет считаться другой\n"
- "          ID пользователя.\n"
+ "Внимание: нет идентификатора пользователя, помеченного как первичный.\n"
+ "          Эта команда может привести к тому, что первичным станет считаться\n"
+ "          другой идентификатор пользователя.\n"
  
 +#: g10/keyedit.c:4321
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
  
@@@ -4407,11 -3451,9 +4430,11 @@@ msgstr "Вы уверены, что х�
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
- msgstr "Такой ID пользователя на этом ключе уже есть!\n"
+ msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
  
 +#: g10/keyedit.c:4509
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Удалить данную действительную подпись? (y/N/q)"
  
@@@ -4439,34 -3476,28 +4462,34 @@@ msgstr[2] "Удалено %d подпи
  msgid "Nothing deleted.\n"
  msgstr "Ничего не удалено.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "недопустимый"
  
 +#: g10/keyedit.c:4587
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "ID пользователя \"%s\" сжат: %s\n"
+ msgstr "Идентификатор пользователя \"%s\" сжат: %s\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[1] "ID пользователя \"%s\": %d подписи удалены\n"
- msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
+ msgstr[0] "Идентификатор пользователя \"%s\": %d подпись удалена\n"
+ msgstr[1] "Идентификатор пользователя \"%s\": %d подписи удалены\n"
+ msgstr[2] "Идентификатор пользователя \"%s\": %d подписей удалено\n"
  
 +#: g10/keyedit.c:4601
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "ID пользователя \"%s\" уже минимизирован\n"
+ msgstr "Идентификатор пользователя \"%s\" уже минимизирован\n"
  
 +#: g10/keyedit.c:4602
  #, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "ID пользователя \"%s\": уже очищен\n"
+ msgstr "Идентификатор пользователя \"%s\": уже очищен\n"
  
 +#: g10/keyedit.c:4671
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4479,11 -3509,9 +4502,11 @@@ msgstr "
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
  
 +#: g10/keyedit.c:4699
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
+ msgstr "Укажите идентификатор пользователя ключа, назначенного отзывающим: "
  
 +#: g10/keyedit.c:4724
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
  
@@@ -4534,16 -3552,13 +4557,16 @@@ msgstr "подписывающий по
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
  
 +#: g10/keyedit.c:5206
  msgid "Please select exactly one user ID.\n"
- msgstr "Выберите ровно один ID пользователя.\n"
+ msgstr "Выберите ровно один идентификатор пользователя.\n"
  
 +#: 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"
+ msgstr "пропуск самоподписи v3 на идентификаторе пользователя \"%s\"\n"
  
 +#: g10/keyedit.c:5418
  msgid "Enter your preferred keyserver URL: "
  msgstr "Введите URL предпочтительного сервера ключей: "
  
@@@ -4563,32 -3574,26 +4586,32 @@@ msgstr "Введите замечани
  msgid "Proceed? (y/N) "
  msgstr "Продолжить? (y/N) "
  
 +#: g10/keyedit.c:5774
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Нет ID пользователя с индексом %d\n"
+ msgstr "Нет идентификатора пользователя с индексом %d\n"
  
 +#: g10/keyedit.c:5836
  #, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Нет ID пользователя с хешем %s\n"
+ msgstr "Нет идентификатора пользователя с хешем %s\n"
  
 +#: g10/keyedit.c:5937
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "Нет подключа с ID ключа '%s'.\n"
+ msgstr "Нет подключа с идентификатором ключа '%s'.\n"
  
 +#: g10/keyedit.c:5959
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Нет подключа с индексом %d\n"
  
 +#: g10/keyedit.c:6100
  #, c-format
  msgid "user ID: \"%s\"\n"
- msgstr "ID пользователя: \"%s\"\n"
+ msgstr "Идентификатор пользователя: \"%s\"\n"
  
 +#: 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"
@@@ -4614,12 -3614,10 +4637,12 @@@ msgstr "Создать сертифик
  msgid "Not signed by you.\n"
  msgstr "Вами не подписано.\n"
  
 +#: g10/keyedit.c:6179
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
- msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
+ msgstr "Вы подписали эти идентификаторы пользователей на ключе %s:\n"
  
 +#: g10/keyedit.c:6208
  msgid " (non-revocable)"
  msgstr " (неотзываемая)"
  
@@@ -4645,17 -3638,16 +4668,19 @@@ msgstr "нет секретного к�
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "попытка отзыва непользовательского идентификатора: %s\n"
  
 +#: g10/keyedit.c:6354
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "ID пользователя \"%s\" уже отозван\n"
+ msgstr "Идентификатор пользователя \"%s\" уже отозван\n"
  
 +#: 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 ""
+ "Внимание: подпись идентификатора пользователя датирована %d секундами в "
+ "будущем\n"
  
 +#: g10/keyedit.c:6485
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Ключ %s уже отозван.\n"
@@@ -4670,71 -3660,55 +4695,71 @@@ msgstr "Подключ %s уже ото
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "предпочтение '%s' дублируется\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "слишком много шифровых предпочтений\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "слишком много предпочтений для хеш-функций\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "слишком много предпочтений для методов сжатия\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "недопустимый элемент '%s' в строке предпочтений\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "запись прямой подписи\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "запись самоподписи\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "запись объединяющей подписи\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "неверный размер ключа; использую %u бит\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "размер ключа округлен вверх до %u бит\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
  "такой длиной хеша\n"
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Подписать"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Заверить"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Зашифровать"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Аутентифицировать"
  
@@@ -4748,150 -3722,119 +4773,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "11223300"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Возможные действия для ключа %s: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Допустимы действия: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Переключить возможность использования для подписи\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Переключить возможность использования для шифрования\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Переключить возможность использования для аутентификации\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Завершено\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Выберите тип ключа:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA и RSA (по умолчанию)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA и Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (только для подписи)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (только для подписи)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (только для шифрования)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (только для шифрования)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC и ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (только для подписи)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (только для шифрования)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Имеющийся ключ\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Введите код ключа:"
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Нет ключа с таким кодом\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "длина ключей %s может быть от %u до %u бит.\n"
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Какой размер подключа необходим? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Какой размер ключа Вам необходим? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запрошенный размер ключа - %u бит\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Выберите эллиптическую кривую:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4907,7 -3850,6 +4932,7 @@@ msgstr "
  "      <n>m = срок действия ключа - n месяцев\n"
  "      <n>y = срок действия ключа - n лет\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4923,38 -3865,30 +4948,38 @@@ msgstr "
  "      <n>m = срок действия подписи - n месяцев\n"
  "      <n>y = срок действия подписи - n лет\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Срок действия ключа? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Срок действия подписи? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "недопустимое значение\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Срок действия ключа не ограничен\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Срок действия подписи не ограничен\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ действителен до %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Подпись действительна до %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4962,11 -3896,9 +4987,11 @@@ msgstr "
  "Ваша система не может отображать даты после 2038 года.\n"
  "Однако даты до 2106 года будут обрабатываться верно.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Все верно? (y/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4980,7 -3912,6 +5005,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4996,49 -3927,38 +5021,49 @@@ msgstr "
  "    \"Вася Пушкин (персонаж) <vp at test.ru>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Ваше полное имя: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Недопустимый символ в имени\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Имя не должно начинаться с цифры\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Имя не должно быть короче 5 символов\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Адрес электронной почты: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Неправильный адрес электронной почты\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Примечание: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Недопустимый символ в примечании\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Используется таблица символов: '%s'.\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5049,7 -3969,6 +5074,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
@@@ -5065,31 -3984,24 +5090,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Сначала исправьте ошибку\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5102,13 -4014,10 +5127,13 @@@ msgstr "
  "случайных чисел больше возможностей получить достаточное количество "
  "энтропии.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Сбой при создании ключа: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5119,63 -4028,50 +5144,63 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Продолжить? (Y/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для \"%s\" уже существует\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Все равно создать новый? (y/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "принудительное создание\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Создание ключа прервано.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не могу создать архивную копию, файл '%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "сохранение открытого ключа в '%s'\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "открытый и секретный ключи созданы и подписаны.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5183,7 -4079,6 +5208,7 @@@ msgstr "
  "Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
  "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5191,7 -4086,6 +5216,7 @@@ msgstr "
  "ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5199,19 -4093,15 +5224,19 @@@ msgstr "
  "ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Секретные части первичного ключа отсутствуют.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Секретные части первичного ключа хранятся на карте.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Действительно создать? (y/N) "
  
@@@ -5293,12 -4167,10 +5318,12 @@@ msgstr "      Отпечаток клю
  msgid "      Card serial no. ="
  msgstr " серийный номер карты ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "занесение таблицы ключей '%s' в буфер\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5306,7 -4178,6 +5331,7 @@@ msgstr[0] "пока в буфер по�
  msgstr[1] "пока в буфер помещено %lu ключей (%lu подписи)\n"
  msgstr[2] "пока в буфер помещено %lu ключей (%lu подписей)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5314,7 -4185,6 +5339,7 @@@ msgstr[0] "в буфер записа�
  msgstr[1] "в буфер записаны %lu ключа"
  msgstr[2] "в буфер записано %lu ключей"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
@@@ -5322,7 -4192,6 +5347,7 @@@ msgstr[0] "(%lu подпись)\n
  msgstr[1] "(%lu подписи)\n"
  msgstr[2] "(%lu подписей)\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: таблица ключей создана\n"
@@@ -5335,11 -4202,9 +5360,11 @@@ msgstr "переназначить на
  msgid "include revoked keys in search results"
  msgstr "включить в результаты поиска отозванные ключи"
  
 +#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
- msgstr "искать по ID ключа, включая подключи"
+ msgstr "искать по идентификатору ключа, включая подключи"
  
 +#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "переназначить настройки времени ожидания для dirmngr"
  
@@@ -5368,12 -4227,10 +5393,12 @@@ msgstr "Введите числа, N) �
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "недопустимый протокол сервера ключей (ожидается %d, получено %d)\n"
  
 +#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr "\"%s\" - не ID ключа: пропущен\n"
+ msgstr "\"%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"
@@@ -5457,22 -4298,18 +5482,22 @@@ msgstr "открытый ключ - %s\
  msgid "public key encrypted data: good DEK\n"
  msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
  
 +#: 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 "зашифровано %u-битным ключом %s с идентификатором %s, созданным %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 "зашифровано ключом %s с ID %s\n"
+ msgstr "зашифровано ключом %s с идентификатором %s\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
  msgstr "сбой расшифровки с открытым ключом: %s\n"
@@@ -5562,17 -4380,14 +5587,17 @@@ msgstr "не могу обработа�
  msgid "Signature made %s\n"
  msgstr "Подпись сделана %s\n"
  
 +#: g10/mainproc.c:1759 g10/mainproc.c:1767
  #, c-format
  msgid "               using %s key %s\n"
- msgstr "               ключом %s с ID %s\n"
+ msgstr "               ключом %s с идентификатором %s\n"
  
 +#: g10/mainproc.c:1771
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Подпись сделана %s ключом %s с ID %s\n"
+ msgstr "Подпись сделана %s ключом %s с идентификатором %s\n"
  
 +#: g10/mainproc.c:1777
  #, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                издатель \"%s\"\n"
@@@ -5613,7 -4420,6 +5638,7 @@@ msgstr "двоичный
  msgid "textmode"
  msgstr "текстовый"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "неизвестно"
  
@@@ -5825,49 -4589,38 +5850,49 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "в подпакете типа %d установлен критический бит\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "проблема с агентом: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Введите фразу-пароль\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "прервано пользователем\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
- msgstr " (ID главного ключа %s)"
+ msgstr " (идентификатор главного ключа %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Введите фразу-пароль для разблокировки секретного ключа OpenPGP:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Введите фразу-пароль для импорта секретного ключа OpenPGP:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Введите фразу-пароль для экспорта секретного подключа OpenPGP:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Введите фразу-пароль для экспорта секретного ключа OpenPGP:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Вы действительно хотите навсегда удалить секретный подключ OpenPGP:"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Вы действительно хотите навсегда удалить секретный ключ OpenPGP:"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -5943,11 -4684,9 +5968,11 @@@ msgstr "Ключ был раскрыт
  msgid "Key is no longer used"
  msgstr "Ключ больше не используется"
  
 +#: 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 "причина отзыва: "
  
@@@ -6059,12 -4778,6 +6084,7 @@@ 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 is bad!  It has been marked as untrusted!  If you\n"
  "*really* know what you are doing, you may answer the next\n"
@@@ -6080,10 -4792,9 +6100,10 @@@ msgid "
  "you may answer the next question with yes.\n"
  msgstr ""
  "НЕТ уверенности в том, что ключ принадлежит человеку, указанному\n"
- "в ID пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
+ "в идентификаторе пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
  "можете ответить на следующий вопрос утвердительно.\n"
  
 +#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Все равно использовать данный ключ? (y/N) "
  
@@@ -6194,11 -4881,9 +6214,11 @@@ msgstr "задан параметр '%s
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "задан параметр '%s', но параметр '%s' не задан\n"
  
 +#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
+ msgstr "Не задан идентификатор пользователя (можно использовать \"-r\").\n"
  
 +#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Текущие получатели:\n"
  
@@@ -6208,13 -4892,11 +6228,13 @@@ msgid "
  "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 "Нет такого идентификатора пользователя.\n"
  
 +#: g10/pkclist.c:1197 g10/pkclist.c:1274
  msgid "skipped: public key already set as default recipient\n"
  msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
  
@@@ -6293,18 -4958,15 +6313,18 @@@ msgstr "старая кодировк�
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "Внимание: в списке предпочтений получателя алгоритм шифрования %s не найден\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "Замечание: секретный ключ %s просрочен с %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "Замечание: ключ был отозван"
  
@@@ -6314,12 -4974,10 +6334,12 @@@
  msgid "build_packet failed: %s\n"
  msgstr "сбой build_packet: %s\n"
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
- msgstr "у ключа %s нет ID пользователя\n"
+ msgstr "у ключа %s нет идентификатора пользователя\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
  msgstr "Будет отозван:\n"
  
@@@ -6607,7 -5220,6 +6627,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "подпись %s/%s пользователя \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6615,11 -5227,9 +6635,11 @@@ msgstr "
  "Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
  "получателя\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "подпись:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "будет использовано шифрование по %s\n"
@@@ -6679,17 -5278,14 +6699,17 @@@ msgstr "неверный отпечат
  msgid "ownertrust value missing"
  msgstr "пропущено значение степени доверия владельцу"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "ошибка при поиске записи о доверии в '%s': %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "ошибка чтения в '%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "таблица доверия: сбой синхронизации: %s\n"
@@@ -6723,7 -5313,6 +6743,7 @@@ msgstr "слишком большая �
  msgid "%s: directory does not exist!\n"
  msgstr "%s: каталог не существует!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "нет доступа к '%s': %s\n"
@@@ -6852,20 -5415,13 +6872,19 @@@ msgstr "ошибка отката на�
  msgid "unsupported TOFU database version: %s\n"
  msgstr "версия базы данных TOFU (не поддерживается): %s\n"
  
 +#: g10/tofu.c:538
- #, fuzzy, c-format
- #| msgid "error creating temporary file: %s\n"
+ #, c-format
  msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
- msgstr "ошибка создания временного файла: %s\n"
+ msgstr "ошибка создания таблицы TOFU 'ultimately_trusted_keys': %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 ""
+ msgstr "ошибка базы данных TOFU"
  
- #: 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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "ошибка чтения базы данных TOFU: %s\n"
@@@ -6880,23 -5434,18 +6899,22 @@@ msgstr "ошибка определен
  msgid "error initializing TOFU database: %s\n"
  msgstr "ошибка инициализации базы данных TOFU: %s\n"
  
 +#: g10/tofu.c:844
- #, fuzzy, c-format
- #| msgid "error reading TOFU database: %s\n"
+ #, c-format
  msgid "error creating 'encryptions' TOFU table: %s\n"
- msgstr "ошибка чтения базы данных TOFU: %s\n"
+ msgstr "ошибка создания таблицы TOFU 'encryptions': %s\n"
  
 +#: g10/tofu.c:874
  #, c-format
  msgid "adding column effective_policy to bindings DB: %s\n"
- msgstr ""
+ msgstr "добавление столбца 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:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "ошибка обновления базы данных TOFU: %s\n"
@@@ -6907,12 -5455,10 +6925,11 @@@ msgid "
  "This is the first time the email address \"%s\" is being used with key %s."
  msgstr "Адрес электронной почты \"%s\" используется с ключом %s впервые."
  
 +#: g10/tofu.c:1337
- #, fuzzy, c-format
- #| msgid "The email address \"%s\" is associated with %d keys!"
+ #, 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 ключами!"
+ msgstr[0] "Адрес электронной почты \"%s\" связан с %d ключом!"
  msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами!"
  msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами!"
  
@@@ -6931,12 -5475,10 +6948,12 @@@ msgstr "
  "Укажите, пожалуйста, следует ли связать этот адрес электронной почты с "
  "ключом %s или вы думаете, что кто-то выдает себя за \"%s\"."
  
 +#: g10/tofu.c:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
- msgstr "ошибка при сборе ID других пользователей: %s\n"
+ msgstr "ошибка при сборе идентификаторов других пользователей: %s\n"
  
 +#: g10/tofu.c:1615
  msgid "This key's user IDs:\n"
  msgstr "Идентификаторы пользователя этого ключа:\n"
  
@@@ -6971,119 -5507,83 +6988,95 @@@ msgstr ", 
  msgid "this key"
  msgstr "этот ключ"
  
 +#: g10/tofu.c:1820
- #, fuzzy, c-format
- #| msgid "Verified %d message"
- #| msgid_plural "Verified %d messages"
+ #, c-format
  msgid "Verified %d message."
  msgid_plural "Verified %d messages."
- msgstr[0] "Проверено %d сообщение"
- msgstr[1] "Проверены %d сообщения"
- msgstr[2] "Проверено %d сообщений"
+ msgstr[0] "Проверено %d сообщение."
+ msgstr[1] "Проверены %d сообщения."
+ msgstr[2] "Проверено %d сообщений."
  
 +#: g10/tofu.c:1824
- #, fuzzy, c-format
- #| msgid "Encrypted %d message"
- #| msgid_plural "Encrypted %d messages"
+ #, c-format
  msgid "Encrypted %d message."
  msgid_plural "Encrypted %d messages."
- msgstr[0] "Зашифровано %d сообщение"
- msgstr[1] "Зашифрованы %d сообщения"
- msgstr[2] "Зашифровано %d сообщений"
+ msgstr[0] "Зашифровано %d сообщение."
+ msgstr[1] "Зашифрованы %d сообщения."
+ msgstr[2] "Зашифровано %d сообщений."
  
 +#: g10/tofu.c:1831
- #, fuzzy, c-format
- #| msgid "Verified %d message"
- #| msgid_plural "Verified %d messages"
+ #, c-format
  msgid "Verified %d message in the future."
  msgid_plural "Verified %d messages in the future."
- msgstr[0] "Проверено %d сообщение"
- msgstr[1] "Проверены %d сообщения"
- msgstr[2] "Проверено %d сообщений"
+ 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"
+ #, c-format
  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."
+ msgstr[0] "Зашифровано %d сообщение в будущем."
+ msgstr[1] "Зашифрованы %d сообщения в будущем."
+ msgstr[2] "Зашифровано %d сообщений в будущем."
  
 +#: g10/tofu.c:1849
- #, fuzzy, c-format
- #| msgid " over the past day."
- #| msgid_plural " over the past %d days."
+ #, c-format
  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 прошедших дней."
+ msgstr[0] "Проверено сообщений за %d прошедший день: %d."
+ msgstr[1] "Проверено сообщений за %d прошедших дня: %d."
+ msgstr[2] "Проверено сообщений за %d прошедших дней: %d."
  
 +#: g10/tofu.c:1855
- #, fuzzy, c-format
- #| msgid " over the past day."
- #| msgid_plural " over the past %d days."
+ #, c-format
  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 прошедших дней."
+ msgstr[0] "Зашифровано сообщений за %d прошедший день: %d."
+ msgstr[1] "Зашифровано сообщений за %d прошедших дня: %d."
+ msgstr[2] "Зашифровано сообщений за %d прошедших дней: %d."
  
 +#: g10/tofu.c:1865
- #, fuzzy, c-format
- #| msgid " over the past month."
- #| msgid_plural " over the past %d months."
+ #, c-format
  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 прошедших месяцев."
+ msgstr[0] "Проверено сообщений за %d прошедший месяц: %d."
+ msgstr[1] "Проверено сообщений за %d прошедших месяца: %d."
+ msgstr[2] "Проверено сообщений за %d прошедших месяцев: %d."
  
 +#: g10/tofu.c:1871
- #, fuzzy, c-format
- #| msgid " over the past month."
- #| msgid_plural " over the past %d months."
+ #, c-format
  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 прошедших месяцев."
+ msgstr[0] "Зашифровано сообщений за %d прошедший месяц: %d."
+ msgstr[1] "Зашифровано сообщений за %d прошедших месяца: %d."
+ msgstr[2] "Зашифровано сообщений за %d прошедших месяцев: %d."
  
 +#: g10/tofu.c:1881
- #, fuzzy, c-format
- #| msgid " over the past year."
- #| msgid_plural " over the past %d years."
+ #, c-format
  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 прошедших дней."
+ msgstr[0] "Проверено сообщений за %d прошедший год: %d."
+ msgstr[1] "Проверено сообщений за %d прошедших года: %d."
+ msgstr[2] "Проверено сообщений за %d прошедших лет: %d."
  
 +#: g10/tofu.c:1887
- #, fuzzy, c-format
- #| msgid " over the past year."
- #| msgid_plural " over the past %d years."
+ #, c-format
  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 прошедших дней."
+ msgstr[0] "Зашифровано сообщений за %d прошедший год: %d."
+ msgstr[1] "Зашифровано сообщений за %d прошедших года: %d."
+ msgstr[2] "Зашифровано сообщений за %d прошедших лет: %d."
  
 +#: g10/tofu.c:1895
- #, fuzzy, c-format
- #| msgid " over the past day."
- #| msgid_plural " over the past %d days."
+ #, c-format
  msgid "Messages verified in the past: %d."
- msgstr " за %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"
+ #, c-format
  msgid "Messages encrypted in the past: %d."
- msgstr ", зашифровано %ld сообщение за %s."
+ msgstr "Зашифровавно сообщений в прошлом: %d."
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
@@@ -7110,11 -5606,11 +7102,13 @@@ msgid "(G)ood, (A)ccept once, (U)nknown
  msgstr ""
  "(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ #, fuzzy
+ #| msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr "Принимается исходное значение (неясно)."
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr "Обнаружено повреждение базы данных TOFU.\n"
  
@@@ -7123,154 -5618,112 +7117,132 @@@
  msgid "resetting keydb: %s\n"
  msgstr "сброс базы данных ключей: %s\n"
  
- #: g10/tofu.c:2601
- #, fuzzy, c-format
- #| msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2605
+ #, c-format
  msgid "error setting TOFU binding's policy to %s\n"
- msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
+ msgstr "ошибка установки правил привязки TOFU в %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "ошибка при смене правила TOFU: %s\n"
  
- #: g10/tofu.c:2839
- #, fuzzy, c-format
- #| msgid "%d~year"
- #| msgid_plural "%d~years"
++#: g10/tofu.c:2852
+ #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
- msgstr[0] "%d~год"
- msgstr[1] "%d~года"
- msgstr[2] "%d~лет"
+ msgstr[0] "%lld~прошедший~год"
+ msgstr[1] "%lld~прошедших~года"
+ msgstr[2] "%lld~прошедших~лет"
  
- #: g10/tofu.c:2844
- #, fuzzy, c-format
- #| msgid "%d~month"
- #| msgid_plural "%d~months"
++#: g10/tofu.c:2857
+ #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
- msgstr[0] "%d~месяц"
- msgstr[1] "%d~месяца"
- msgstr[2] "%d~месяцев"
+ msgstr[0] "%lld~прошедший~месяц"
+ msgstr[1] "%lld~прошедших~месяца"
+ msgstr[2] "%lld~прошедших~месяцев"
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~прошедшую~неделю"
+ msgstr[1] "%lld~прошедшие~недели"
+ msgstr[2] "%lld~прошедших~недель"
  
- #: g10/tofu.c:2854
- #, fuzzy, c-format
- #| msgid "%d~day"
- #| msgid_plural "%d~days"
++#: g10/tofu.c:2867
+ #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
- msgstr[0] "%d~день"
- msgstr[1] "%d~дня"
- msgstr[2] "%d~дней"
+ msgstr[0] "%lld~прошедший~день"
+ msgstr[1] "%lld~прошедших~дня"
+ msgstr[2] "%lld~прошедших~дней"
  
- #: g10/tofu.c:2859
- #, fuzzy, c-format
- #| msgid "%d~hour"
- #| msgid_plural "%d~hours"
++#: g10/tofu.c:2872
+ #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
- msgstr[0] "%d~час"
- msgstr[1] "%d~часа"
- msgstr[2] "%d~часов"
+ msgstr[0] "%lld~прошедший~час"
+ msgstr[1] "%lld~прошедших~часа"
+ msgstr[2] "%lld~прошедших~часов"
  
- #: g10/tofu.c:2864
- #, fuzzy, c-format
- #| msgid "%d~minute"
- #| msgid_plural "%d~minutes"
++#: g10/tofu.c:2877
+ #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
- msgstr[0] "%d~минута"
- msgstr[1] "%d~минуты"
- msgstr[2] "%d~минут"
+ msgstr[0] "%lld~прошедшую~минуту"
+ msgstr[1] "%lld~прошедшие~минуты"
+ msgstr[2] "%lld~прошедших~минут"
  
- #: g10/tofu.c:2866
- #, fuzzy, c-format
- #| msgid "%d~second"
- #| msgid_plural "%d~seconds"
++#: g10/tofu.c:2879
+ #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
- msgstr[0] "%d~секунда"
- msgstr[1] "%d~секунды"
- msgstr[2] "%d~секунд"
+ msgstr[0] "%lld~прошедшую~секунду"
+ msgstr[1] "%lld~прошедшие~секунды"
+ msgstr[2] "%lld~прошедших~секунд"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
- msgstr ""
+ msgstr "%s: Проверено 0~подписей, зашифровано 0~сообщений."
  
- #: g10/tofu.c:3109
- #, fuzzy, c-format
- #| msgid "Verified %ld signatures"
++#: g10/tofu.c:3124
+ #, c-format
  msgid "%s: Verified 0 signatures."
- msgstr "Проверено %ld подписей"
+ msgstr "%s: Проверено 0 подписей."
  
- #: g10/tofu.c:3117
- #, fuzzy, c-format
- #| msgid "Verified %ld signature in the past %s"
- #| msgid_plural "Verified %ld signatures in the past %s"
++#: g10/tofu.c:3132
+ #, c-format
  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."
+ msgstr[0] "%s: Проверена %ld~подпись за %s."
+ msgstr[1] "%s: Проверены %ld~прописи за %s."
+ msgstr[2] "%s: Проверено %ld~подписей за %s."
  
- #: g10/tofu.c:3127
- #, fuzzy
- #| msgid "Encrypted %d message"
- #| msgid_plural "Encrypted %d messages"
++#: g10/tofu.c:3142
  msgid "Encrypted 0 messages."
- msgstr "Зашифровано %d сообщение"
+ msgstr "Зашифровано 0 сообщений."
  
- #: 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"
++#: g10/tofu.c:3150
+ #, c-format
  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."
+ msgstr[0] "Зашифровано %ld~сообщение за %s."
+ msgstr[1] "Зашифрованы %ld~сообщения за %s."
+ msgstr[2] "Зашифровано %ld~сообщений за %s."
  
- #: g10/tofu.c:3146
- #, fuzzy, c-format
- #| msgid "policy: %s"
++#: g10/tofu.c:3161
+ #, c-format
  msgid "(policy: %s)"
  msgstr "правило: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
  "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
  "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  "Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  "Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7303,33 -5756,27 +7275,33 @@@ msgstr[2] "
  "некачественный командой\n"
  "  %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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "ошибка при открытии базы данных TOFU: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, 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"
+ #| msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  "ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
  "идентификаторов пользователя.\n"
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
  msgstr ""
  "ошибка установки правил для ключа %s с идентификатором пользователя \"%s\": "
  "%s"
  
 +#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
- msgstr "'%s' не является допустимым длинным ID ключа\n"
+ msgstr "'%s' не является допустимым длинным идентификатором ключа\n"
  
 +#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "ключ %s: принят как доверенный ключ\n"
@@@ -7367,50 -5807,40 +7339,50 @@@ msgstr "Можно попытатьс�
  msgid "If that does not work, please consult the manual\n"
  msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "использую модель доверия %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "проверка таблицы доверия не нужна\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "срок следующей проверки таблицы доверия %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "проверять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "открытый ключ %s не найден: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "выполните --check-trustdb, пожалуйста\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "проверка таблицы доверия\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7418,7 -5848,6 +7390,7 @@@ msgstr[0] "обработан %d клю
  msgstr[1] "обработаны %d ключа"
  msgstr[2] "обработано %d ключей"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7426,16 -5855,13 +7398,16 @@@ msgstr[0] " (сброшен %d счет
  msgstr[1] " (сброшены %d счетчика достоверности)\n"
  msgstr[2] " (сброшено %d счетчиков достоверности)\n"
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "абсолютно доверенных ключей не найдено\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7443,7 -5869,6 +7415,7 @@@ msgstr "
  "глубина: %d  достоверных: %3d  подписанных: %3d  доверие: %d-, %dq, %dn, "
  "%dm, %df, %du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7553,19 -5957,14 +7525,19 @@@ msgstr "
  "Синтаксис: kbxutil [параметры] [файлы]\n"
  "Просмотр, экспорт, импорт данных щита с ключами\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Функция обработки PIN возвратила ошибку: %s\n"
@@@ -7614,7 -6004,6 +7586,7 @@@ msgstr "
  "|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
  "подписей."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "ошибка при получении нового PIN: %s\n"
@@@ -7629,68 -6016,68 +7601,85 @@@ msgstr "сбой при сохране�
  msgid "failed to store the creation date: %s\n"
  msgstr "сбой при сохранении даты создания: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "ошибка получения статуса CHV с карты\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "в ответе отсутствует модуль RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "в ответе отсутствует открытая экспонента RSA\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  msgid "response does not contain the EC public key\n"
  msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "ответ не содержит данных открытого ключа\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "сбой при чтении открытого ключа: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "основной PIN применяется как %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Введите PIN%%0A[сделано подписей: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Введите PIN"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "сбой при проверке CHV%d: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "ошибка получения статуса CHV с карты\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "карта окончательно заблокирована!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7703,25 -6090,19 +7692,24 @@@ msgstr[2] "
  "осталось %d попыток ввода административного PIN перед блокировкой карты\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:2086
- #, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "|A|Введите административный PIN%%0A[осталось попыток: %d]"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Введите административный PIN"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "доступ к командам управления не настроен\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Введите PIN"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Введите код сброса для карты"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@@ -7729,77 -6110,59 +7717,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новый код сброса"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новый административный PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Новый PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Введите административный PIN и новый административный PIN"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Введите PIN и новый PIN"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "ошибка чтения данных приложения\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "ошибка чтения отпечатка DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "ключ уже существует\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "существующий ключ будет заменен\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "генерация нового ключа\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "запись нового ключа\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "пропущена метка времени создания\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "Простое число RSA %s пропущено или его размер не равен %d бит\n"
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "сбой сохранения ключа: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "кривая не поддерживается\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "сбой при генерации ключа\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7807,31 -6170,25 +7795,31 @@@ msgstr[0] "создание ключа 
  msgstr[1] "создание ключа завершено (%d секунды)\n"
  msgstr[2] "создание ключа завершено (%d секунд)\n"
  
- #: scd/app-openpgp.c:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "отпечаток на карте не совпадает с запрошенным\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карта не поддерживает хеш-функцию %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "создано подписей: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "проверка административного PIN в данный момент запрещена этой командой\n"
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@@ -7851,51 -6205,39 +7839,51 @@@ msgstr "|N|Первоначальны�
  msgid "run in multi server mode (foreground)"
  msgstr "работать в многосерверном режиме (нефоновый режим)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|сохранять журнал в файл FILE"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|подключаться к считывателю на порту N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAME|использовать NAME как драйвер ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|использовать NAME как драйвер PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "не использовать внутренний драйвер CCID"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|отключить карту после N секунд неактивности"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "не использовать клавиатуру считывателя"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "не позволять использовать административные команды карты"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "использовать входные данные переменой длины для клавиатуры считывателя"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Вызов: @SCDAEMON@ [параметры] (-h для подсказки)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7908,22 -6249,14 +7896,17 @@@ msgid "please use the option '--daemon
  msgstr ""
  "используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "обработчик fd %d запущен\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "обработчик fd %d остановлен\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "недопустимый символ radix64 %02x пропущен\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "в этом сеансе dirmngr не работает\n"
  
@@@ -7940,12 -6270,10 +7923,12 @@@ msgstr "цепь
  msgid "shell"
  msgstr "оболочка"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "критичное расширение сертификата %s не поддерживается"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "издатель сертификата не помечен как удостоверяющий центр"
  
@@@ -7958,11 -6284,9 +7941,11 @@@ msgstr "незаданные прави
  msgid "failed to open '%s': %s\n"
  msgstr "не могу открыть '%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Замечание: некритичные правила сертификата недопустимы"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "правила сертификата недопустимы"
  
@@@ -7989,9 -6308,6 +7972,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8012,12 -6324,10 +7995,12 @@@ msgstr "проверьте, что \"di
  msgid "checking the CRL failed: %s"
  msgstr "сбой проверки списка отозванных сертификатов: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "сертификат с недействительной достоверностью: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "сертификат еще не достоверен"
  
@@@ -8029,7 -6337,6 +8012,7 @@@ msgstr "корневой сертифи
  msgid "intermediate certificate not yet valid"
  msgstr "промежуточный сертификат еще не достоверен"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "сертификат просрочен"
  
@@@ -8078,7 -6374,6 +8061,7 @@@ msgstr "  (сертификат дей�
  msgid "  (     issuer valid from "
  msgstr "  (  издатель действителен с "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "отпечаток=%s\n"
@@@ -8109,7 -6398,6 +8092,7 @@@ msgstr "в сертификате не 
  msgid "self-signed certificate has a BAD signature"
  msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "корневой сертификат не помечен как доверенный"
  
@@@ -8118,30 -6405,24 +8101,30 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "сбой проверки списка доверия: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "слишком длинная цепочка сертификатов\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "не найден издатель сертификата"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "сертификат имеет ПЛОХУЮ подпись"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "найден еще один возможный сертификат удостоверяющего центра - повторная "
  "попытка"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "цепочка сертификатов длиннее допускаемой удостоверяющим центром (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "хороший сертификат\n"
  
@@@ -8167,11 -6443,9 +8150,11 @@@ msgstr "используется схе
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%u-битный хеш недопустим для %u-битного ключа %s\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(это алгоритм MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "нет"
  
@@@ -8202,39 -6471,31 +8185,39 @@@ msgid "
  msgstr ""
  "Введите фразу-пароль для доступа к секретному ключу сертификата X.509:\n"
  "\"%s\"\n"
- "S/N %s, ID 0x%08lX,\n"
+ "S/N %s, идентификатор 0x%08lX,\n"
  "создан %s, истекает %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "не задана применимость ключа - подразумеваем все\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "ошибка получения информации применимости ключа: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "сертификат не следовало использовать для заверения\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "сертификат не следовало использовать для подписывания ответа OCSP\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "сертификат не следовало использовать для шифрования\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "сертификат не следовало использовать для подписей\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "сертификат не пригоден для шифрования\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "сертификат не пригоден для подписи\n"
  
@@@ -8328,7 -6571,6 +8311,7 @@@ msgstr "строка %d: ошибка �
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "строка %d: сбой создания ключа: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8336,64 -6578,51 +8319,64 @@@ msgstr "
  "Чтобы завершить создание этого запроса сертификата, введите фразу-пароль для "
  "ключа, который вы только что создали, еще раз.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Имеющийся ключ\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Имеющийся на карте ключ\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "ошибка чтения карты: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Серийный номер карты: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Доступные ключи:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Возможные действия для ключа %s:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) подпись, шифрование\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) подпись\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) шифрование\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Введите имя субъекта X.509: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Не задано имя субъекта\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Недопустимая метка имени субъекта '%.*s'\n"
@@@ -8403,73 -6632,56 +8386,73 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Недопустимое имя субъекта '%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "33"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Введите адреса электронной почты"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr "(завершите пустой строкой):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Введите имена DNS"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (необязательно; завершите пустой строкой):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Введите URI"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Создать самозаверенный сертификат? (y/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Используются параметры:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Сейчас создается самозаверенный сертификат."
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Сейчас создается запрос сертификата."
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "Это может занять немного времени...\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Готово.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Готово. Данный запрос теперь следует передать в удостоверяющий центр.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "проблема ресурсов: нехватка выделенной памяти\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(это алгоритм RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(это не похоже на зашифрованное сообщение)\n"
  
@@@ -8602,7 -6783,6 +8585,7 @@@ msgstr "|FILE|добавить табл
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|искать ключи на данном сервере ключей"
  
@@@ -8685,17 -6849,14 +8668,17 @@@ msgstr "ошибка сохранени
  msgid "basic certificate checks failed - not imported\n"
  msgstr "ошибка базовой проверки сертификата - не импортирован\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "ошибка получения сохраненных признаков: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "ошибка импорта сертификата: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "ошибка чтения ввода: %s\n"
@@@ -8766,7 -6916,6 +8749,7 @@@ msgstr "
  "\n"
  "%s%sВы уверены, что хотите этого?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8785,160 -6933,131 +8768,166 @@@ msgstr "
  "\"%s\"\n"
  "Обратите внимание, что этот сертификат НЕ создает квалифицированных подписей!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "хеш-функция %d (%s) для %d не поддерживается; использую %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "хеш-функция для подписи %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "сбой при проверке квалифицированной подписи: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Подпись сделана "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[дата не указана]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr " с помощью сертификата с ID 0x%08lX\n"
+ msgstr " с помощью сертификата с идентификатором 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "недопустимая подпись: атрибут хеш-функции сообщения не соответствует "
  "вычисленному\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Хорошая подпись пользователя"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                         или"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Это квалифицированная подпись\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "не могу инициализировать блокировку буфера сертификатов: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "не могу получить блокировку для чтения из буфера сертификатов: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "не могу получить блокировку для записи в буфер сертификатов: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "не могу снять блокировку буфера сертификатов: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "опускается %u сертификатов из буфера\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "не могу интерпретировать сертификат '%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "сертификат '%s' уже в буфере\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "доверенный сертификат '%s' загружен\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "сертификат '%s' удален\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  отпечаток SHA1 =% s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "  издатель ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "   субъект ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "ошибка загрузки сертификата '%s': %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "      постоянно загруженных сертификатов: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "сертификатов в буфере времени исполнения: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "сертификатов в буфере времени исполнения: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "сертификат уже в буфере\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "сертификат в буфере\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "ошибка помещения сертификата в буфер: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "неверный отпечаток SHA1 '%s'\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "ошибка получения сертификата по серийному номеру: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "ошибка получения сертификата по субъекту: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "в сертификате не найден издатель\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "ошибка получения authorityKeyIdentifier: %s\n"
@@@ -8973,7 -7086,6 +8962,7 @@@ msgstr "удаление файла б�
  msgid "not removing file '%s'\n"
  msgstr "не удаляю файл '%s'\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "ошибка закрытия файла буфера: %s\n"
@@@ -9136,48 -7215,44 +9125,51 @@@ msgstr "вызов unlock_db_file дл�
  msgid "failed to create a new cache object: %s\n"
  msgstr "сбой создания нового объекта буфера: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, c-format
  msgid "no CRL available for issuer id %s\n"
- msgstr "списка отозванных сертификатов для издателя с ID %s нет в наличии\n"
+ msgstr ""
+ "списка отозванных сертификатов для издателя с идентификатором %s нет в "
+ "наличии\n"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
- "список отозванных сертификатов для издателя с ID %s в буфере слишком стар; "
- "требуется обновление\n"
+ "список отозванных сертификатов для издателя с идентификатором %s в буфере "
+ "слишком стар; требуется обновление\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 и прошло %d минут для издателя с ID %s; "
- "требуется обновление\n"
+ "действует force-crl-refresh и прошло %d минут для издателя с идентификатором "
+ "%s; требуется обновление\n"
  
 +#: dirmngr/crlcache.c:1315
  #, c-format
  msgid "force-crl-refresh active for issuer id %s; update required\n"
  msgstr ""
- "для издателя с ID %s действует force-crl-refresh; требуется обновление\n"
+ "для издателя с идентификатором %s действует force-crl-refresh; требуется "
+ "обновление\n"
  
 +#: dirmngr/crlcache.c:1324
  #, c-format
  msgid "available CRL for issuer ID %s can't be used\n"
  msgstr ""
- "доступный список отозванных сертификатов для издателя с ID %s нельзя "
- "использовать\n"
+ "доступный список отозванных сертификатов для издателя с идентификатором %s "
+ "нельзя использовать\n"
  
 +#: dirmngr/crlcache.c:1335
  #, c-format
  msgid "cached CRL for issuer id %s tampered; we need to update\n"
  msgstr ""
- "список отозванных сертификатов для издателя с ID %s в буфере поврежден; его "
- "нужно обновить\n"
+ "список отозванных сертификатов для издателя с идентификатором %s в буфере "
+ "поврежден; его нужно обновить\n"
  
 +#: dirmngr/crlcache.c:1347
  msgid "WARNING: invalid cache record length for S/N "
  msgstr "Внимание: недопустимая для серийного номера длина буферной записи "
  
@@@ -9203,7 -7274,6 +9195,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "ошибка получения данных из файла буфера: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "недопустимая хеш-функция '%s'\n"
@@@ -9217,12 -7285,10 +9209,12 @@@ msgstr "сбой gcry_md_open для а
  msgid "got an invalid S-expression from libksba\n"
  msgstr "из libksba получено недопустимое S-выражение\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "сбой преобразования S-выражения: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "сбой создания S-выражения: %s\n"
@@@ -9275,88 -7332,72 +9267,88 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "сбой проверки подписи списка отозванных сертификатов: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr ""
  "ошибка проверки достоверности сертификата издателя списка отозванных "
  "сертификатов: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "сбой ksba_crl_new: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "сбой ksba_crl_set_reader: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "удален залипший временный файл буфера '%s'\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "проблема удаления залипшего временного файла буфера '%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "ошибка создания временного файла буфера '%s': %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "сбой crl_parse_insert: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "ошибка завершения временного файла буфера '%s': %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "ошибка закрытия временного файла буфера '%s': %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "Внимание: новый список отозванных сертификатов тоже слишком стар; срок "
  "действия истек %s - тем не менее загружаю\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  "новый список отозванных сертификатов тоже слишком стар; срок действия истек "
  "%s\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "неизвестное критическое расширение списка отозванных сертификатов %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "ошибка чтения расширений списка отозванных сертификатов: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "создание файла буфера '%s'\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "проблема при переименовании '%s' в '%s': %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9364,12 -7405,10 +9356,12 @@@ msgstr "
  "сбой обновления файла каталога - запись буфера будет утеряна при следующем "
  "запуске программы\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "Начало вывода списка отозванных сертификатов (полученного через %s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
@@@ -9377,56 -7416,45 +9369,56 @@@ msgstr "
  " Ошибка: Список отозванных сертификатов использован не будет, потому что "
  "после обновления он все равно слишком стар!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  " Ошибка: Список отозванных сертификатов не будет использован из-за "
  "неизвестного критического расширения!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " Ошибка: Список отозванных сертификатов использован не будет\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  " Ошибка: Этот список отозванных сертификатов в буфере, возможно, подменен!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr "Внимание: найдена недопустимая длина буферной записи\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "проблема при чтении буферной записи: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "проблема при чтении ключа буфера: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "ошибка чтения записи буфера из базы данных: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Конец вывода списка отозванных сертификатов\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "сбой crl_fetch через DP: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "сбой crl_cache_insert через DP: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "сбой crl_cache_insert через издателя: %s\n"
@@@ -9435,51 -7462,39 +9427,51 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "ожидание ресурсов для объекта чтения\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "используется \"http\" вместо \"https\"\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  msgid "CRL access not possible due to disabled %s\n"
  msgstr ""
  "Доступ к списку отозванных сертификатов невозможен\n"
  "из-за того, что не задействуется %s\n"
  
- #: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
- #: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "ошибка инициализации объекта устройства чтения: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "слишком много перенаправлений\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "ошибка получения '%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "ошибка получения '%s': статус HTTP %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr ""
  "Доступ к списку отозванных сертификатов невозможен\n"
  "из-за режима Tor\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "поиск сертификата невозможен из-за того, что не задействуется %s\n"
@@@ -9621,120 -7607,90 +9613,118 @@@ msgstr "нужно абсолютно�
  msgid "looking up '%s'\n"
  msgstr "поиск '%s'\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "вывести содержание буфера списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|получить список отозванных сертификатов из URL"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "выключить dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "записать буфер на диск"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "работать, не спрашивая пользователя"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "разрешить посылку запросов OCSP"
  
- #: dirmngr/dirmngr.c:184
- #, fuzzy
- #| msgid "query the software version database"
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
- msgstr "запросить базу данных версий программ"
+ msgstr "разрешить проверку версий программ по сети"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "запретить использование HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "запретить использование LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по HTTP"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по LDAP"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "игнорировать URL служб OCSP из сертификата"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|перенаправлять все запросы HTTP на URL"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|использовать хост HOST для поиска LDAP"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не пользоваться запасными хостами с --ldap-proxy"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|взять список серверов LDAP из файла FILE"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  "добавлять новые серверы, обнаруженные в точках распространения списков "
  "отозванных сертификатов, в список серверов"
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|установить время ожидания LDAP N секунд"
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|использовать ответчик OCSP по URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|не возвращать более чем N результатов одного поиска"
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
  "по TLS"
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "проводить весь сетевой обмен через Tor"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9743,11 -7699,9 +9733,11 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. в руководстве \"info\")\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9755,77 -7709,60 +9745,77 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
  "Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "допустимые уровни отладки: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "вызов: %s [параметры] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "двоеточия в имени сокета недопустимы\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: обнаружен неверный отпечаток\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: ошибка чтения: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: мусор в конце строки игнорируется\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "получен SIGUSR2 - действие не определено\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "получен SIGTERM - завершение работы ...\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "получен SIGTERM - осталось %d активных соединений\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "принудительное выключение\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "получен SIGINT - немедленное завершение работы\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "получен сигнал %d - действие не определено\n"
@@@ -10055,35 -7944,28 +10045,35 @@@ msgstr "недопустимый сим
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "добавление '%s:%d' к списку серверов LDAP\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "сбой malloc: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: недопустимый шаблон '%s'\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search достиг предела сервера по размеру\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "найдено недопустимое каноническое S-выражение\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "сбой в gcry_md_open: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "ух ты: сбой ksba_cert_hash: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "обнаружена плохая кодировка URL\n"
  
@@@ -10115,244 -7991,188 +10105,240 @@@ msgstr "ошибка установк�
  msgid "error building OCSP request: %s\n"
  msgstr "ошибка построения запроса OCSP: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "ошибка соединения с '%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "ошибка чтения ответа HTTP для '%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "ошибка чтения '%s': статус HTTP %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "ошибка разбора ответа OCSP для '%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "статус ответчика OCSP на '%s': %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "сбой получения хеша ответа OCSP для '%s': %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "не подписано основным сертификатом подписывающего OCSP"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "для ответов OCSP поддерживается только SHA-1\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "сбой размещения элемента списка: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
- msgstr "ошибка при получении ID ответчика: %s\n"
+ msgstr "ошибка при получении идентификатора ответчика: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "не найдено подходящего сертификата для проверки ответа OCSP\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "не найден сертификат издателя: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "вызывавший не вернул целевой сертификат\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "вызывавший не вернул издающий сертификат\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "сбой при выделении памяти под контекст OCSP: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "не могу получить authorityInfoAccess: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "не определен основной ответчик OCSP\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "не определен основной подписывающий в OCSP\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "используется основной ответчик OCSP '%s'\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "используется ответчик OCSP '%s'\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "сбой при установлении контекста хеша для OCSP: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "ошибка получения статуса OCSP для целевого сертификата: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "статус сертификата: %s (этот=%s, следующий=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "хороший"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "сертификат был отозван %s по причине: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "ответчик OCSP возвратил статус в будущем\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "ответчик OCSP возвратил нетекущий статус\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "ответчик OCSP возвратил слишком старый статус\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "сбой assuan_inquire(%s): %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "нет сервера LDAP"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
- msgstr "в ID сертификата нет серийного номера"
+ msgstr "в идентификаторе сертификата нет серийного номера"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "сбой assuan_inquire: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "сбой fetch_cert_by_url: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "ошибка отправки данных: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "сбой start_cert_fetch: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "сбой fetch_next_cert: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "превышено max_replies %d\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "сбой размещения контекста Assuan: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "сбой инициализации сервера: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "сбой регистрации команд с помощью Assuan: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема с приемом Assuan: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "сбой обработки Assuan: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  "принимающий коренной удостоверяющий центр не помечен как удостоверяющий центр"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "слишком глубоко вложенная проверка списка отозванных сертификатов\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "не проверяю список отозванных сертификатов для"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "проверка списка отозванных сертификатов для"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "сбой при проверке доверенности корневого сертификата: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "хорошая цепочка сертификатов\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA требует 160-битной хеш-функции\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  "сертификат не следовало использовать для подписывания списка отозванных "
@@@ -10449,201 -8248,143 +10435,191 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Параметры, управляющие настройками"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "Параметры, полезные для отладки"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Параметры, управляющие безопасностью"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|сбрасывать ключи SSH по истечении N секунд"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|установить максимальный срок запоминания PIN N секунд"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|установить максимальный срок действия ключа SSH N секунд"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Параметры, обеспечивающие правила для фраз-паролей"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "не позволять обходить правила для фраз-паролей"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|установить минимальную длину фразы-пароля равной N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|n|требовать для новой фразы-пароля не менее N неалфавитных символов"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FILE|проверять новую фразу-пароль по файлу образцов FILE"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|считать фразу-пароль устаревшей через N дней"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "не разрешать повторное использование старых фраз-паролей"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|установить время ожидания ввода пароля N секунд"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|использовать NAME как основной секретный ключ"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NAME|зашифровывать также для ID пользователя NAME"
+ msgstr "|NAME|зашифровывать также для идентификатора пользователя NAME"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|установить синонимы электронной почты"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Настройки серверов ключей"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|использовать север ключей по URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "разрешить поиск по PKA (запросы DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  "|MECHANISMS|использовать механизмы MECHANISMS для поиска ключей по адресу "
  "электронной почты"
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "полностью запретить доступ к dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|NAME|использовать кодировку NAME для фраз-паролей PKCS#12"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "не проверять списки отозванных сертификатов для корневых сертификатов"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Параметры, управляющие форматом вывода"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Параметры, управляющие применением Tor"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Настройки серверов HTTP"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "использовать системные настройки промежуточного сервера HTTP"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Настройки серверов LDAP"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "Список серверов LDAP"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Настройки OCSP"
  
- #: tools/gpgconf-comp.c:1081
- #, fuzzy
- #| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
- msgstr "GPG для OpenPGP"
+ msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
- msgstr ""
+ msgstr "Закрытые ключи"
  
- #: tools/gpgconf-comp.c:1083
- #, fuzzy
- #| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
- msgstr "Демон криптографических карт"
+ msgstr "Криптографические карты"
  
- #: tools/gpgconf-comp.c:1084
- #, fuzzy
- #| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
- msgstr "GPG для S/MIME"
+ msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
- msgstr ""
+ msgstr "Сеть"
  
- #: tools/gpgconf-comp.c:1086
- #, fuzzy
- #| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1093
  msgid "Passphrase Entry"
- msgstr "Ввод PIN и фраз-паролей"
+ msgstr "Ввод фраз-паролей"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Компонент не подходит для запуска"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Внешняя проверка компонента %s не прошла"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Обратите внимание, что спецификации групп игнорируются\n"
  
- #: tools/gpgconf-comp.c:4094
- #, fuzzy, c-format
- #| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4125
+ #, c-format
  msgid "error closing '%s'\n"
- msgstr "ошибка закрытия '%s': %s\n"
+ msgstr "ошибка закрытия '%s'\n"
  
- #: tools/gpgconf-comp.c:4096
- #, fuzzy, c-format
- #| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4127
+ #, c-format
  msgid "error parsing '%s'\n"
- msgstr "ошибка при получении хеша '%s': %s\n"
+ msgstr "ошибка при интерпретации '%s'\n"
  
 +#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "вывод списка всех компонентов"
  
@@@ -10667,13 -8403,9 +10643,11 @@@ msgstr "|COMPONENT|проверить �
  msgid "apply global default values"
  msgstr "применить глобальные значения по умолчанию"
  
 +#: tools/gpgconf.c:81
- #, fuzzy
- #| msgid "|FILE|take policy information from FILE"
  msgid "|FILE|update configuration files using FILE"
- msgstr "|FILE|взять информацию о правилах из файла FILE"
+ msgstr "|FILE|обновить файлы конфигурации из файла FILE"
  
 +#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "получить каталоги настроек для @GPGCONF@"
  
diff --cc po/sk.po
index 68ee18f,9840924..cd396b9
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -18,7 -17,6 +18,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@@ -29,40 -27,31 +29,40 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nesprávne heslo
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr ""
  
@@@ -80,75 -68,59 +80,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "nesprávne heslo"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "riadok je príliš dlhý\n"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "heslo je príliš dlhé\n"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Neplatný znak ve mene\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "nesprávne MPI"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "nesprávne heslo"
@@@ -158,150 -129,115 +158,157 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "nemôžem otvoriť `%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "nenájdený zapisovateľný súbor tajných kľúčov (secring): %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "zmeniť heslo"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "Opakujte heslo: "
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Opakujte heslo: "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "Opakujte heslo: "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "heslo nie je zopakované správne; skúste to znovu"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "heslo nie je zopakované správne; skúste to znovu"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
  msgstr "heslo nie je zopakované správne; skúste to znovu"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -386,48 -308,33 +393,48 @@@ msgstr "
  "Možnosti:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "Kľúč je nahradený"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -512,11 -402,6 +519,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
@@@ -534,47 -417,34 +541,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "%s: nemôžem vytvoriť: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -584,28 -453,22 +591,28 @@@
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
@@@ -633,7 -490,6 +640,7 @@@ msgstr "databáza dôvery: procedúra r
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: nemôžem vytvoriť adresár: %s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -658,12 -510,10 +665,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: preskočené: %s\n"
@@@ -685,8 -531,6 +692,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -694,9 -538,6 +701,9 @@@ msgstr "
  "@Príkazy:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -750,8 -583,6 +757,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -810,8 -632,6 +817,8 @@@ msgstr "
  msgid "Yes"
  msgstr "ano"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -862,19 -675,16 +869,19 @@@ msgstr "zmeniť heslo
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  msgid "Delete key"
  msgstr "nastaviť kľúč ako platný (enable)"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -894,7 -701,6 +901,7 @@@ msgstr "
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
@@@ -921,22 -723,14 +928,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -951,8 -743,6 +958,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -962,12 -751,10 +969,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
@@@ -1194,8 -935,6 +1201,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1331,7 -1043,10 +1338,12 @@@ msgstr "chyba v pätičke\n
  msgid "[none]"
  msgstr "neznáme"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "zapisujem tajný kľúč do `%s'\n"
@@@ -1407,7 -1108,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "nespracované"
@@@ -1466,8 -1155,6 +1478,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1636,8 -1290,6 +1648,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1298,10 +1659,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Váš výber? "
  
@@@ -1722,17 -1354,11 +1734,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
@@@ -1799,7 -1412,6 +1811,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, 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 -1437,10 +1842,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrúhlené na %u bitov\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
@@@ -1891,9 -1485,6 +1903,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Neplatný výber.\n"
  
@@@ -2028,23 -1590,15 +2040,23 @@@ msgstr "Neplatný príkaz (skúste \"he
  msgid "--output doesn't work for this command\n"
  msgstr "--output pre tento príkaz nefunguje\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1648,6 +2118,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -2144,7 -1679,6 +2156,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2275,40 -1785,31 +2287,40 @@@ msgstr "
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: preskočené: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "zapisujem do '%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "kľúč %08lX: PGP 2.x kľúč - preskočené\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "VAROVANIE: nič nebolo vyexportované\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2595,7 -2035,6 +2607,7 @@@ msgstr "
  msgid "use canonical text mode"
  msgstr "použiť kánonický textový mód"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
@@@ -2780,475 -2191,377 +2792,479 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  #, 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:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  #, 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:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 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:3170
++#: g10/gpg.c:3174
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nemožno nastaviť exec-path na %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROVANIE: %s prepíše %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Nie je dovolené používať %s s %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nedáva s %s zmysel!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "položka completes-needed musí byť väčšia ako 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "položka marginals-needed musí byť väčšia ako 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  #, 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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "neplatné defaultné predvoľby\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ešte nepracuje s %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "dešifrovanie zlyhalo: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nepodaril sa export kľúča: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "nepodarilo sa nájsť server: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "aktualizácia servera zlyhala: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Začnite písať svoju správu ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "Zmazať tento kľúč zo súboru kľúčov? "
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "konflikt časového razítka"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|zapísať informácie o stave do tohto FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Použitie: gpgv [možnosti] [súbory] (-h pre pomoc)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4603,15 -3651,10 +4619,15 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  #, fuzzy
  msgid "revoked"
  msgstr "[revokované]"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  #, fuzzy
  msgid "expired"
  msgstr "expire"
@@@ -4651,7 -3688,6 +4667,7 @@@ msgstr "Ste si istý, že ho chcete st�
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4683,7 -3713,6 +4699,7 @@@ msgstr[1] "Zmazaný %d podpis.\n
  msgid "Nothing deleted.\n"
  msgstr "Nič nebolo zmaznané.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  #, fuzzy
  msgid "invalid"
  msgstr "neplatný spôsob reprezentácie v ASCII"
@@@ -4923,74 -3904,58 +4939,74 @@@ msgid "Displaying %s photo ID of size %
  msgstr ""
  "Zobrazujem %s fotografické ID s veľkosťou %ld pre kľúč 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "neplatný znak v reťazci s predvoľbami\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "zapisujem podpis kľúča sebou samým\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "zapisujem \"key-binding\" podpis\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  #, fuzzy
  msgid "Encrypt"
  msgstr "šifrovať dáta"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr ""
  
@@@ -5004,157 -3969,126 +5020,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (len na podpis)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Podpisová notácia: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5170,7 -4104,6 +5186,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5186,40 -4119,32 +5202,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:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Kľúč je platný na? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Podpis je platný na? (0) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "platnosť %s skončí %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Platnosť podpisu vyprší %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5227,12 -4152,10 +5243,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:2516
++#: g10/keygen.c:2501
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Je to správne (a/n)? "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5243,7 -4166,6 +5259,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:2599
++#: g10/keygen.c:2584
  #, fuzzy
  msgid ""
  "\n"
@@@ -5260,50 -4182,39 +5276,50 @@@ msgstr "
  "    \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Meno a priezvisko: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Neplatný znak ve mene\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Meno nemôže začínať číslicou\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Komentár: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Neplatný znak v komentári\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5314,7 -4225,6 +5330,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5329,35 -4239,28 +5345,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "mMkKeEPpUu"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Najskôr, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5369,13 -4272,10 +5385,13 @@@ msgstr "
  "používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
  "entropie.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5383,66 -4283,53 +5399,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' je už skomprimovaný\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Použiť napriek tomu tento kľúč? "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Vytváranie kľúča bolo zrušené.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, 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:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5451,7 -4338,6 +5467,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5459,7 -4345,6 +5475,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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5467,22 -4352,18 +5483,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  #, 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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Skutočne vytvoriť? "
@@@ -5565,26 -4430,22 +5581,26 @@@ msgstr "   Fingerprint kľúča =
  msgid "      Card serial no. ="
  msgstr ""
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
  msgstr "kontrolujem súbor kľúčov (keyring) `%s'\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "%lu kľúčov skontrolovaných (%lu podpisov)\n"
  msgstr[1] "%lu kľúčov skontrolovaných (%lu podpisov)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5592,7 -4453,6 +5608,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 zlý podpis\n"
  msgstr[1] "1 zlý podpis\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: súbor kľúčov (keyring) vytvorený\n"
@@@ -5900,7 -4698,6 +5916,7 @@@ msgstr "binárne
  msgid "textmode"
  msgstr "textový mód"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "neznáme"
  
@@@ -6117,55 -4872,44 +6133,55 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "podpaket typu %d má nastavený kritický bit\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problém s agentom: agent vracia 0x%lx\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Vložiť heslo\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "zrušené užívateľom\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr " (hlavné ID kľúča %08lX)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6599,17 -5260,14 +6615,17 @@@ msgstr "staré kódovanie DEK nie je po
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "šifrovací algoritmus %d%s je neznamý alebo je zakázaný\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "POZNÁMKA: v predvoľbách nenájdený šifrovací algoritmus %d\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6906,18 -5515,15 +6922,18 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s podpis od: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, 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:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "podpisujem:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "bude použité šifrovanie %s\n"
@@@ -6984,17 -5579,14 +7000,17 @@@ msgstr "
  "importovať hodnoty dôveryhodnosti\n"
  " vlastníka kľúča"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "chyba pri hľadaní záznamu dôvery: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "chyba pri čítaní: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
@@@ -7028,7 -5614,6 +7044,7 @@@ msgstr "transakcia s databázou dôver
  msgid "%s: directory does not exist!\n"
  msgstr "%s: adresár neexistuje!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "nemôžem zavrieť `%s': %s\n"
@@@ -7171,10 -5728,6 +7187,10 @@@ msgstr "chyba pri vytváraní hesla: %s
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7206,7 -5754,6 +7222,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7378,11 -5898,9 +7394,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7391,121 -5908,101 +7407,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Zmazaných %d podpisov.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "zašifrované s %lu heslami\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  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:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "(policy: %s)"
  msgstr "Politika: "
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7522,18 -6019,14 +7538,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7584,56 -6068,45 +7600,56 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "nie je nutné kontrolovať databázu dôvery\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "dalšia kontrola databázy dôvery %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "prosím vykonajte --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrolujem databázu dôvery\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7641,22 -6114,18 +7657,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, 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"
@@@ -7770,19 -6218,14 +7786,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:726 scd/app-openpgp.c:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:806 scd/app-openpgp.c:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
@@@ -7831,7 -6265,6 +7847,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -7846,69 -6277,67 +7862,84 @@@ msgstr "nemôžem inicializovať datab�
  msgid "failed to store the creation date: %s\n"
  msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, fuzzy, c-format
  msgid "reading public key failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+ msgid "Remaining attempts: %d"
  msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7917,27 -6346,22 +7948,27 @@@ msgstr[0] "
  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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "zmeniť heslo"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "zmeniť heslo"
+ 
++#: scd/app-openpgp.c:2619
  #, 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:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7945,117 -6369,93 +7976,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "chyba pri čítaní bloku kľúča: %s\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' je už skomprimovaný\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  #, fuzzy
  msgid "generating new key\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, 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:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "toto URI nie je podporované"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@@ -8076,57 -6473,45 +8107,57 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|MENO|použiť MENO ako implicitného adresáta"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|MENO|použiť MENO ako implicitného adresáta"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "vôbec nepoužívať terminál"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "konfliktné príkazy\n"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8136,22 -6520,14 +8167,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@@ -8170,12 -6543,10 +8196,12 @@@ msgstr "
  msgid "shell"
  msgstr "help"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8188,12 -6557,10 +8214,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "nemôžem otvoriť `%s': %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "zapisujem tajný kľúč do `%s'\n"
@@@ -8221,9 -6583,6 +8247,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8246,12 -6601,10 +8272,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8264,7 -6615,6 +8290,7 @@@ msgstr "zapisujem tajný kľúč do `%s
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Platnosť kľúča vypršala!"
@@@ -8320,7 -6659,6 +8346,7 @@@ msgstr "nesprávny certifikát
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "vypísať fingerprint"
@@@ -8350,7 -6682,6 +8376,7 @@@ msgstr "vytvoriť revokačný certifik�
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8359,29 -6689,23 +8385,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifikovať podpis"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "duplicita predvoľby %c%lu\n"
@@@ -8410,11 -6729,9 +8436,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "nie"
@@@ -8450,36 -6762,28 +8476,36 @@@ msgstr "
  "\"%.*s\"\n"
  "kľúč s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8573,72 -6859,58 +8599,72 @@@ msgstr "chyba pri vytváraní súboru k
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (len na podpis)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "nastaviť kľúč ako neplatný (disable)"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (pro šifrování a podpis)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(Žiadny popis)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
@@@ -8648,81 -6920,64 +8674,81 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "E-mailová adresa: "
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "Napíšte identifikátor užívateľa (user ID). Ukončite prázdnym riadkom: "
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Vložte nový názov súboru"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "Ak chcete, napíšte popis; ukončite prázdnym riadkom:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr ""
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8866,7 -7090,6 +8892,7 @@@ msgstr "
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr ""
@@@ -8956,17 -7163,14 +8982,17 @@@ msgstr "vytvoriť revokačný certifik�
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -9030,7 -7223,6 +9056,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9044,168 -7235,138 +9070,173 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "Platnosť podpisu vypršala %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "Dobrý podpis od \""
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "                alias \""
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
  "Ide o podpis kľúča ním samým\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "vypísať fingerprint"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "nesprávny certifikát"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "chyba: neplatný odtlačok\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "vytvoriť revokačný certifikát"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
@@@ -9242,7 -7397,6 +9273,7 @@@ msgstr "zmazanie bloku kľúča sa nepo
  msgid "not removing file '%s'\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
@@@ -9466,7 -7576,6 +9497,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9483,12 -7590,10 +9514,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr "neplatná reakcia od agenta\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "nemožno otvoriť súbor: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
@@@ -9538,148 -7634,119 +9569,148 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "verifikácia podpisu potlačená\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "zapisujem do '%s'\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "rev? problém overenia revokácie: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "aktualizácia zlyhala: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
@@@ -9688,50 -7754,38 +9719,50 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  msgid "too many redirections\n"
  msgstr "príliš veľa `%c' predvolieb\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "chyba pri vytváraní `%s': %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "kľúč `%s' nebol nájdený: %s\n"
@@@ -9884,116 -7909,88 +9915,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Ukončiť bez uloženia? "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, 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:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10007,91 -8004,72 +10038,91 @@@ msgstr "
  "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
  "možností)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "použitie: gpg [možnosti] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "chyba: neplatný odtlačok\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "chyba pri čítaní: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "nespracované"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10331,38 -8261,31 +10362,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "vyhľadávam \"%s\" na HKP serveri %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: neplatná verzia súboru %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "nemožno otvoriť súbor: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10395,255 -8312,199 +10426,251 @@@ msgstr "chyba pri čítaní `%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "vytvoriť revokačný certifikát"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "%s: nemôžem pristupovať k: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "nie je nastavený implicitný súbor tajných kľúčov %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "použitá šifra %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "POZNÁMKA: kľúč bol revokovaný"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrolujem databázu dôvery\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verifikovať podpis"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "duplicita predvoľby %c%lu\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA požaduje použitie 160 bitového hashovacieho algoritmu\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10740,193 -8580,146 +10767,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|použiť mód hesla N"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|MENO|šifrovať pre MENO"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, 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:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "chyba siete"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "nesprávne heslo"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "verejný kľúč nenájdený"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "chyba pri čítaní `%s': %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  msgid "error parsing '%s'\n"
  msgstr "chyba pri čítaní `%s': %s\n"
diff --cc po/sv.po
index 730871e,ebb985f..d13d49f
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -34,7 -33,6 +34,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@@ -45,47 -43,38 +45,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "_Avbryt"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "PIN-kod:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Avbryt"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -93,7 -82,6 +93,7 @@@ msgstr "Ange ny lösenfras
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -103,7 -91,6 +103,7 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@@ -112,7 -99,6 +112,7 @@@
  "och specialtecken. Fråga din administratör om mer exakt information hur\n"
  "man anger säkra lösenfraser."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -120,61 -106,47 +120,61 @@@ msgstr "
  "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
  "sessionen"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
  "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Lösenfras:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "stämmer inte överens - försök igen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (försök %d av %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN-koden är för lång"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Lösenfrasen är för lång"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Ogiltiga tecken i PIN-kod"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN-kod för kort"
  
  # MPI står för Multiple Precision Integer (tror jag)
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Felaktig PIN-kod"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Felaktig lösenfras"
  
@@@ -185,76 -156,57 +185,84 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "kan inte öppna \"%s\": %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "fel när serienumret hämtades från kortet: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "identifierade kort med serienummer: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "ingen lämplig kortnyckel hittades: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "fel vid hämtning av lagrade flaggor: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Ange denna lösenfras igen"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -263,69 -215,54 +271,69 @@@ msgstr "
  "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
  "gpg-agents nyckellager"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "misslyckades med att skapa flöde från uttag: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Mata in kortet med serienummer"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 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"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Admin PIN-kod"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK-kod"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Nollställ kod"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, fuzzy, c-format
  #| msgid "%s%%0A%%0AUse the reader's keypad for input."
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Upprepa denna nollställningskod"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Upprepa denna PUK-kod"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Upprepa denna PIN-kod"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Nollställningskoden repeterades inte korrekt; försök igen"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "PUK-koden repeterades inte korrekt; försök igen"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN-kod repeterades inte korrekt; försök igen"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "fel när temporärfil skapades: %s\n"
@@@ -432,47 -355,32 +440,47 @@@ msgstr "
  "@Flaggor:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "kör i serverläge (förgrund)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, 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:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sh-liknande kommandoutdata"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "csh-liknande kommandoutdata"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "frigör inte från konsollen"
  
@@@ -556,11 -447,6 +564,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
@@@ -584,48 -468,35 +592,48 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, 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:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan inte skapa uttag: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
@@@ -636,30 -506,24 +644,30 @@@ msgid "a gpg-agent is already running 
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "fel vid hämtning av nonce för uttaget\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() misslyckades: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
@@@ -691,7 -549,6 +699,7 @@@ msgstr "stat() misslyckades för \"%s\"
  msgid "can't use '%s' as home directory\n"
  msgstr "kan inte använda \"%s\" som hemkatalog\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fel vid läsning av nonce på fd %d: %s\n"
@@@ -716,13 -569,11 +724,13 @@@ msgstr "ssh-hanteraren 0x%lx för fd %
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppad\n"
@@@ -746,8 -593,6 +754,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
  "Underhåll av lösenordscache\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -756,9 -601,6 +764,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:532 g10/gpgv.c:72 kbx/kbxutil.c:81
- #: sm/gpgsm.c:246 dirmngr/dirmngr.c:168 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -812,8 -646,6 +820,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -880,8 -703,6 +888,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nej"
  
@@@ -937,7 -751,6 +945,7 @@@ msgstr "ändra lösenfras
  msgid "I'll change it later"
  msgstr "Jag ändrar den senare"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -945,13 -758,11 +953,13 @@@
  "%%0A?"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "aktivera nyckel"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -972,7 -780,6 +980,7 @@@ msgstr "%s-nyckeln använder en osäke
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@@ -999,23 -802,15 +1007,23 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fel vid grening av process: %s\n"
@@@ -1031,8 -824,6 +1039,8 @@@ msgstr "misslyckades med att vänta p�
  msgid "error running '%s': probably not installed\n"
  msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
@@@ -1044,13 -834,11 +1052,13 @@@ msgstr "fel vid körning av \"%s\": avs
  msgid "error running '%s': terminated\n"
  msgstr "fel vid körning av \"%s\": avslutades\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
@@@ -1276,8 -1018,6 +1284,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmen stöds inte: %s"
@@@ -1398,7 -1111,11 +1406,13 @@@ msgstr "ignorerar skräprad
  msgid "[none]"
  msgstr "[ingen]"
  
+ # överhoppad eller hoppades över?
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "argument förväntades inte"
  
@@@ -1467,7 -1170,6 +1481,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "slut på minne\n"
  
@@@ -1530,8 -1221,6 +1544,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s är för gammal (behöver %s, har %s)\n"
@@@ -1704,8 -1360,6 +1718,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1366,9 +1727,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Vad väljer du? "
  
@@@ -1782,17 -1416,11 +1796,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "fel vid läsning av \"%s\": %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
@@@ -1853,7 -1468,6 +1867,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
@@@ -1893,13 -1502,10 +1907,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "avrundade uppåt till %u bitar\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
@@@ -1961,9 -1557,6 +1975,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Ogiltigt val.\n"
  
@@@ -2094,23 -1658,15 +2108,23 @@@ msgid "--output doesn't work for this c
  msgstr "--output kan inte användas för detta kommando\n"
  
  # se förra kommentaren
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1715,6 +2185,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "fel när lösenfras skapades: %s\n"
@@@ -2211,7 -1748,6 +2225,7 @@@ msgstr "
  "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
  "mottagarinställningarna\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2340,39 -1852,30 +2354,39 @@@ msgstr "ta bort så mycket som möjlig
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: hoppade över: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skriver till \"%s\"\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "export av hemliga nycklar tillåts inte\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "VARNING: ingenting exporterat\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2649,7 -2091,6 +2663,7 @@@ msgstr "|N|ställ in komprimeringsnivå
  msgid "use canonical text mode"
  msgstr "använd \"ursprunglig text\"-läget"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FIL|skriv utdata till FIL"
  
@@@ -2860,484 -2273,386 +2874,488 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "okänd konfigurationspost \"%s\"\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "visa foto-id under nyckellistning"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "visa policy-url:er under signaturlistningar"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "visa alla notationer under signaturlistningar"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "visa IETF-standardnotationer under signaturlistningar"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "visa användarangivna notationer under signaturlistningar"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "visa giltighet för användaridentitet vid nyckellistningar "
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "visa nyckelringens namn i nyckellistningar"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "visa utgångsdatum under signaturlistningar"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "okänd flagga \"%s\"\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "kunde inte tolka url till nyckelserver\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ogiltiga importeringsflaggor\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "ogiltiga importflaggor\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ogiltiga exportflaggor\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "ogiltiga exportinställningar\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "visa foto-id under signaturvalidering"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "visa policy-url:er under signaturvalidering"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "visa alla notationer under signaturvalidering"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "visa IETF-standardnotationer under signaturvalidering"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "visa användarangivna notationer under signaturvalidering"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "visa giltighet för användaridentitet vid signaturvalidering"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "visa endast primär användaridentitet i signaturvalidering"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "validera signaturer med PKA-data"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "öka tillit på signaturer med giltigt PKA-data"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  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:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VARNING: %s gäller istället för %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s är inte tillåten tillsammans med %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, 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:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "VARNING: kör med falsk systemtid: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "den valda chifferalgoritmen är ogiltig\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "vald sammandragsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "vald komprimeringsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  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:3729
++#: g10/gpg.c:3733
  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:3731
++#: g10/gpg.c:3735
  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:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  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:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "ogiltig inställning av personligt chiffer\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s fungerar ännu inte med  %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sändning till nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "hämtning från nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export av nyckeln misslyckades: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "sökning på nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "misslyckades med att skapa ASCII-skal: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv ditt meddelande här ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FIL|ta nycklarna från nyckelringen FIL "
  
  # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
  # Kommandot är avsett att användas i "near online system".
  # Krav från RIPE.
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  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:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation till denna FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4684,14 -3734,9 +4702,14 @@@ msgstr "
  "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
  "såvida inte du startar om programmet.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "spärrad"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "utgånget"
  
@@@ -4731,7 -3770,6 +4749,7 @@@ msgstr "Vill du verkligen fortfarande l
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
  
@@@ -4764,7 -3796,6 +4782,7 @@@ msgstr[1] "Raderade %d signatur.\n
  msgid "Nothing deleted.\n"
  msgstr "Ingenting raderat.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "ogiltigt"
  
@@@ -5008,73 -3991,57 +5026,73 @@@ msgstr "Undernyckeln %s är redan spär
  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:316
++#: g10/keygen.c:317
  #, 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:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "för många chifferinställningar\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "för många sammandragsinställningar\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "för många komprimeringsinställningar\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "skriver direkt signatur\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "skriver självsignatur\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "skriver signatur knuten till nyckeln\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Signera"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Certifiera"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Kryptera"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Autentisera"
  
@@@ -5092,159 -4059,128 +5110,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Möjliga åtgärder för en %s-nyckel: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "För närvarande tillåtna åtgärder: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Växla signeringsförmågan\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Växla krypteringsförmågan\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Växla autentiseringsförmågan\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Färdig\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Välj vilken typ av nyckel du vill ha:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA och RSA (standard)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (endast signering)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (endast kryptering)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, 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:1924
++#: g10/keygen.c:1909
  #, 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:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Befintlig nyckel\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Ange nyckelhashen: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  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:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Ingen nyckel med denna nyckelhash\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, 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:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, 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:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Vilken nyckelstorlek vill du ha? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5261,7 -4197,6 +5279,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:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5277,38 -4212,30 +5295,38 @@@ msgstr "
  "      <n>m = signaturen blir ogiltig efter n månader\n"
  "      <n>y = signaturen blir ogiltig efter n år\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen är giltig hur länge? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "ogiltigt värde\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Nyckeln går aldrig ut\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen går aldrig ut\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nyckeln går ut %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen går ut %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5316,11 -4243,9 +5334,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Stämmer detta? (j/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5335,7 -4260,6 +5353,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5353,50 -4277,39 +5371,50 @@@ msgstr "
  "    \"Gustav Vasa (Brutal kung) <gustav at trekronor.se>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Namn: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Ogiltigt tecken i namnet\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Namnet får inte börja med en siffra\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-postadress: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "E-postadressen är ogiltig\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Ogiltigt tecken i kommentaren\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5407,7 -4320,6 +5425,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
  
@@@ -5423,35 -4335,28 +5441,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoAa"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Rätta först felet\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5463,13 -4368,10 +5481,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:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nyckelgenereringen misslyckades: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5477,72 -4379,59 +5495,72 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, 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:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "genererar ny nyckel\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Skapandet av nycklar avbröts.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  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:4792
++#: g10/keygen.c:4816
  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"
@@@ -5552,7 -4441,6 +5570,7 @@@ msgstr "
  "syfte.\n"
  
  # c-format behövs inte i singularis
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5560,7 -4448,6 +5578,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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5568,21 -4455,17 +5586,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:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  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:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Verkligen skapa? (j/N) "
  
@@@ -5663,13 -4530,11 +5681,13 @@@ msgstr "Nyckelns fingeravtryck =
  msgid "      Card serial no. ="
  msgstr "       Kortets serienr ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "mellanlagrar nyckelringen \"%s\"\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5677,14 -4542,12 +5695,14 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
  msgstr[1] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5692,7 -4555,6 +5710,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 felaktig signatur\n"
  msgstr[1] "1 felaktig signatur\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: nyckelring skapad\n"
@@@ -6000,7 -4800,6 +6018,7 @@@ msgstr "binär
  msgid "textmode"
  msgstr "textläge"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "okänd"
  
@@@ -6224,61 -4981,50 +6242,61 @@@ msgstr "VARNING: potentiellt osäker sy
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problem med agenten: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Ange lösenfrasen\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "avbruten av användaren\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (primära nyckelns id %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6722,19 -5385,16 +6740,19 @@@ msgstr "gammal kodning av krypteringsny
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "chifferalgoritmen %d%s är okänd eller inaktiverad\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
  "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -7051,7 -5662,6 +7069,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s signatur från: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7059,11 -5669,9 +7077,11 @@@ msgstr "
  "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
  "mottagarinställningarna\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "signerar:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "krypteringen %s kommer att användas\n"
@@@ -7125,19 -5722,16 +7143,19 @@@ msgstr "ogiltigt fingeravtryck
  msgid "ownertrust value missing"
  msgstr "värde för ägartillit saknas"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "läsfel i \"%s\":  %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@@ -7174,7 -5762,6 +7192,7 @@@ msgstr "tillitsdatabastransaktion för 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: katalogen finns inte!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7318,10 -5877,6 +7336,10 @@@ msgstr "fel när temporärfil skapades
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7356,7 -5906,6 +7374,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fel vid öppnandet av \"%s\": %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7535,11 -6057,9 +7553,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7549,79 -6068,67 +7567,79 @@@
  msgid "resetting keydb: %s\n"
  msgstr "fel vid skrivning av nyckel: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "fel vid lagring av flaggor: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "Raderade %d signaturer.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7629,13 -6136,11 +7647,13 @@@ msgid_plural "%s: Verified %ld~signatur
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "krypterad med %lu lösenfraser\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7643,31 -6148,25 +7661,31 @@@ msgid_plural "Encrypted %ld~messages i
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "giltighet: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7684,19 -6183,15 +7702,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7750,55 -6236,45 +7768,55 @@@ msgstr "Du kan försöka att skapa till
  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:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "använder tillitsmodellen %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, 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:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "publika nyckeln %s hittades inte: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  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:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "kontrollerar  tillitsdatabasen\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7807,7 -6283,6 +7825,7 @@@ msgstr[0] "%lu nycklar behandlade än s
  msgstr[1] "%lu nycklar behandlade än så länge\n"
  
  # Vad är detta!?
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7815,23 -6290,19 +7833,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7959,19 -6409,14 +7977,19 @@@ msgstr "
  "Syntax: kbxutil [flaggor] [filer]\n"
  "lista, exportera, importera nyckelskåpsdata\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-återanrop returnerade fel: %s\n"
@@@ -8021,7 -6457,6 +8039,7 @@@ msgstr "
  "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
  "signaturer med."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 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"
@@@ -8036,70 -6469,70 +8054,87 @@@ msgstr "misslyckades med att lagra fing
  msgid "failed to store the creation date: %s\n"
  msgstr "misslyckades med att lagra datum för skapandet: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "fel vid hämtning av CHV-status från kort\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "svaret innehåller inte en RSA-modulus\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svaret innehåller inte den publika RSA-exponenten\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "svaret innehåller inte publikt nyckeldata\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "läsning av publik nyckel misslyckades: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "använder standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "validering av CHV%d misslyckades: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "fel vid hämtning av CHV-status från kort\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "kortet är låst permanent!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -8111,25 -6544,19 +8146,24 @@@ msgstr[1] "
  "%d försök för Admin PIN-koden återstår innan kortet låses permanent\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Ange administratörens PIN-kod"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Ange PIN-koden"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Ange nollställningskoden för kortet"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -8137,83 -6564,65 +8171,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nollställningskod"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN-kod"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN-kod"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, 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:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "fel vid läsning av programdata\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "fel vid läsning av fingeravtryckets DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "befintlig nyckel kommer att ersättas\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "genererar ny nyckel\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "skriver ny nyckel\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "tidsstämpel för skapandet saknas\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "misslyckades med att lagra nyckeln: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "algoritmen stöds inte: %s"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "var god vänta under tiden nyckeln genereras ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "nyckelgenereringen misslyckades\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8221,32 -6630,26 +8255,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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  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:4019
++#: scd/app-openpgp.c:4174
  #, 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:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer skapade hittills: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@@ -8268,55 -6668,43 +8302,55 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FIL|skriv en logg till FIL"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|anslut till läsare på port N"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "använd inte den interna CCID-drivrutinen"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|koppla från kortet efter N sekunder inaktivitet"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  #, fuzzy
  #| msgid "do not use a reader's keypad"
  msgid "do not use a reader's pinpad"
  msgstr "använd inte läsarens knappsats"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "neka användning av administratörskommandon för kort"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, 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:288
++#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8335,23 -6722,14 +8369,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "hanterare för fd %d startad\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "hanterare för fd %d avslutad\n"
  
- # överhoppad eller hoppades över?
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8370,12 -6745,10 +8398,12 @@@ msgstr "kedja
  msgid "shell"
  msgstr "skal"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "kritiska certifikattillägget %s stöds inte"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "utfärdarens certifikat är inte markerat som en CA"
  
@@@ -8389,13 -6760,11 +8417,13 @@@ msgstr "kritisk markerad policy utan ko
  msgid "failed to open '%s': %s\n"
  msgstr "misslyckades med att öppna \"%s\": %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "certifikatpolicy tillåts inte"
  
@@@ -8422,9 -6786,6 +8450,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8445,12 -6802,10 +8473,12 @@@ msgstr "se till att \"dirmngr\" är kor
  msgid "checking the CRL failed: %s"
  msgstr "kontroll mot spärrlistan misslyckades: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikat med felaktig giltighetstid: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "certifikatet är ännu inte giltigt"
  
@@@ -8462,7 -6815,6 +8490,7 @@@ msgstr "rotcertifikatet är ännu inte 
  msgid "intermediate certificate not yet valid"
  msgstr "tillfälligt certifikat är ännu inte giltigt"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "certifikatet har gått ut"
  
@@@ -8511,7 -6852,6 +8539,7 @@@ msgstr "  (certifikat giltigt från 
  msgid "  (     issuer valid from "
  msgstr "  (     utfärdare giltig från "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeravtryck=%s\n"
@@@ -8541,7 -6875,6 +8569,7 @@@ msgstr "ingen utfärdare hittades i cer
  msgid "self-signed certificate has a BAD signature"
  msgstr "självsignerat certifikat har en FELAKTIG signatur"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "rotcertifikatet har inte markerats som betrott"
  
@@@ -8550,28 -6882,22 +8578,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "kontroll mot tillitslistan misslyckades: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "certifikatkedjan är för lång\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "utfärdarens certifikat hittades inte"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "certifikatet har en FELAKTIG signatur"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "certifikatet är korrekt\n"
  
@@@ -8597,11 -6918,9 +8625,11 @@@ msgstr "valideringsmodell använd: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(det här är MD2-algoritmen)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "ingen"
  
@@@ -8636,44 -6950,36 +8664,44 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "skapad %s, går ut %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  #, fuzzy
  #| msgid "certificate should have not been used for certification\n"
  msgid "certificate should not have been used for certification\n"
  msgstr "certifikatet skulle inte använts för certifiering\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  #, fuzzy
  #| msgid "certificate should have not been used for encryption\n"
  msgid "certificate should not have been used for encryption\n"
  msgstr "certifikatet skulle inte använts för kryptering\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for signing\n"
  msgstr "certifikatet skulle inte använts för signering\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "certifikatet är inte användbart för kryptering\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "certifikatet är inte användbart för signering\n"
  
@@@ -8784,7 -7072,6 +8812,7 @@@ msgstr "rad %d: fel vid hämtning av ny
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "rad %d: nyckelgenerering misslyckades: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8792,64 -7079,51 +8820,64 @@@ msgstr "
  "Ange lösenfrasen en gång till för nyckeln som du just skapade för att "
  "färdigställa denna certifikatbegäran.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Befintlig nyckel\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Befintlig nyckel från kort\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "fel vid läsning av kortet: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Serienummer för kortet: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Tillgängliga nycklar:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Möjliga åtgärder för en %s-nyckel:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) signering, kryptering\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) signering\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) kryptering\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Ange ämnesnamn för X.509: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Inget ämnesnamn angivet\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8860,80 -7134,63 +8888,80 @@@ msgstr "Ogiltig ämnesnamnsetikett \"%.
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
  msgstr "Ogiltigt ämnesnamn \"%s\"\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "20"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Ange e-postadresser"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (avsluta med en tom rad):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Ange DNS-namn"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (valfritt: avsluta med en tom rad:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Ange URI:er"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
  msgstr "självsignerat certifikat har en FELAKTIG signatur"
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
  msgstr "Skapar nu en certifikatbegäran.  Det kan ta en stund ...\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Färdig.  Du bör nu skicka denna begäran till din certifikatutfärdare.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "resursproblem: slut på minne\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(det här är RC2-algoritmen)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
  
@@@ -9069,7 -7295,6 +9097,7 @@@ msgstr "|FIL|lägg till nyckelring til
  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:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
  
@@@ -9163,17 -7372,14 +9191,17 @@@ msgstr "fel vid lagring av certifikat\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "fel vid hämtning av lagrade flaggor: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "fel vid import av certifikat: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "fel vid läsning av indata: %s\n"
@@@ -9245,7 -7440,6 +9273,7 @@@ msgstr "
  "\n"
  "%s%sÄr du säker på att du vill göra det här?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9265,180 -7458,151 +9293,186 @@@ msgstr "
  "Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
  "signatur!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "hashalgoritm %d (%s) för signerare %d stöds inte; använder %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Signatur gjord "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[datum inte angivet]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " använder certifikat-id 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "ogiltig signatur: attribut för kontrollsumma matchar inte den beräknade\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Korrekt signatur från"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "      även känd som"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Det här är en kvalificerad signatur\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
  msgstr "slår upp utfärdare från Dirmngr-cachen\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "kan inte skapa \"%s\": %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
  msgstr "certifikatet \"%s\" togs bort\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
  msgstr "dubblett av certifikatet \"%s\" borttaget\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
  msgstr "certifikatet \"%s\" togs bort\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "fingeravtryck=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
  msgstr "Inkluderade certifikat"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
  msgstr "antal matchande certifikat: %d\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "number of matching certificates: %d\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "antal matchande certifikat: %d\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
  msgstr "  (certifikat skapat "
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate cached\n"
  msgstr "certifikatet är korrekt\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
  msgstr "ingen utfärdare hittades i certifikatet"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9480,7 -7638,6 +9514,7 @@@ msgstr "mottagande rad misslyckades: %s
  msgid "not removing file '%s'\n"
  msgstr "misslyckades med att skapa ASCII-skal: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9725,7 -7838,6 +9759,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "fel vid hämtning av lagrade flaggor: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9740,13 -7850,11 +9774,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "iconv_open misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9802,164 -7901,135 +9836,164 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "signaturvalidering utlämnad\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "fel vid inläsning av betrodda rotcertifikat\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "läsning misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "fel när temporärfil skapades: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "misslyckades med att uppdatera hemligheten: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "fel vid skrivning till temporärfil: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "fel när temporärfil skapades: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
  msgstr "fel vid läsning av indata: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
  msgstr "fel när ett rör skapades: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid notation data found\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "VARNING: ogiltig notationsdata hittades\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
  msgstr "fel vid läsning av kortet: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
  msgstr "fel vid läsning av nonce på fd %d: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "läsning misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "kontroll mot tillitslistan misslyckades: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9969,54 -8038,42 +10003,54 @@@ msgstr "mottagande rad misslyckades: %s
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: fel vid läsning av katalogpost: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "för många chifferinställningar\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
  msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
  msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "certifikatet \"%s\" hittades inte: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate search not possible due to disabled %s\n"
@@@ -10182,128 -8210,100 +10216,128 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, 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:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "skicka ett kommando till dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv serverlägesloggar till FIL"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Avsluta utan att spara? (j/N) "
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, 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:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  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:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10316,13 -8316,11 +10350,13 @@@ msgstr "
  "@\n"
  "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, 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:363
++#: dirmngr/dirmngr.c:383
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10334,88 -8332,71 +10368,88 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, 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:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "användning: gpgsm [flaggor] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "inte tvingad"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10673,40 -8606,33 +10707,40 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "skickar nyckeln %s till %s-servern %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: ogiltig filversion %d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
  msgstr "iconv_open misslyckades: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "misslyckades med att uppdatera hemligheten: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10744,288 -8664,232 +10778,284 @@@ msgstr "fel vid lagring av flaggor: %s\
  msgid "error building OCSP request: %s\n"
  msgstr "fel vid inläsning av \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
  msgstr "fel vid skrivning till \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "fel vid läsning från %s: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
  msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "fel när \"%s\" bands till uttag: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "kontroll mot tillitslistan misslyckades: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
  msgstr "mottagande rad misslyckades: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "fel vid hämtning av ny PIN-kod: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
  msgstr "utfärdarens certifikat hittades inte"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
  msgstr "fel vid inläsning av betrodda rotcertifikat\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
  msgstr "fel vid lagring av certifikat\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "misslyckades med att allokera keyDB-hanterare\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "kan inte komma åt \"%s\": %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
  msgstr "använder standard-PIN som %s\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "använder %s-chiffer\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "certifikatet har spärrats"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "sändande rad misslyckades: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "sändande rad misslyckades: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "signeringen misslyckades: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
  msgstr "utfärdarens certifikat är inte markerat som en CA"
  
  # originalet borde ha ett value
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "kontrollerar  tillitsdatabasen\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
  msgstr "kontroll mot spärrlistan misslyckades: %s"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
  msgstr "självsignerat certifikat har en FELAKTIG signatur"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
  msgstr "certifikatet är korrekt\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
@@@ -11133,193 -8976,146 +11163,193 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Flaggor som kontrollerar konfigurationen"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Flaggor som kontrollerar säkerheten"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "tillåt inte att gå förbi lösenfraspolicyn"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "tillåt inte återanvändning av gamla lösenfraser"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|ange e-postalias (ett eller flera)"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration för nyckelservrar"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "inaktivera all åtkomst till dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "kontrollera inte spärrlistor för rotcertifikat"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Flaggor som kontrollerar formatet på utdata"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Flaggor som kontrollerar säkerheten"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration för HTTP-servrar"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "använd systemets HTTP-proxyinställningar"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration av LDAP-servrar som ska användas"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAP-serverlista"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Konfiguration för OCSP"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Felaktig lösenfras"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponenten hittades inte"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Extern validering av komponenten %s misslyckades"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Observera att gruppspecifikationer ignoreras\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/tr.po
index 9aeb6a4,0e4e743..037e999
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -18,7 -17,6 +18,7 @@@
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  "X-Generator: KBabel 1.11.4\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "PIN giriş kilidi edinilemedi: %s\n"
@@@ -29,41 -27,32 +29,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -71,7 -60,6 +71,7 @@@ msgstr "Yeni anahtar parolasını girin
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Kalite:"
  
@@@ -81,11 -69,9 +81,11 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -93,7 -79,6 +93,7 @@@ msgstr "
  "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
  "olabilecek"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -101,53 -86,40 +101,53 @@@ msgstr "
  "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
  "kilitsiz olabilecek"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Anahtar Parolası:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "aynı değiller - tekrar deneyin"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (%d/%d dene)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "PIN çok uzun"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Anahtar Parolası çok uzun"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "PIN içinde geçersiz karakterler var"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "PIN çok kısa"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "PIN hatalı"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Anahtar Parolası hatalı"
  
@@@ -156,76 -127,57 +156,84 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "`%s' açılamıyor: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "kartın seri numarası alınırken hata: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "Algılanan kartın seri nr: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "uygun bir kart anahtarı yok: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "saklanmış bayraklar alınırken hata: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Lütfen bu anahtar parolasını tekrar girin"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -234,70 -186,55 +242,70 @@@ msgstr "
  "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
  "için lütfen anahtar parolası giriniz"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "sokette akım oluşturulamadı: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Yönetici PIN'i"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Sıfırlama Kodu"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Bu Sıfırlama Kodu tekrarlansın"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "Bu PIN tekrarlansın "
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Bu PIN tekrarlansın "
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "geçici dosya oluşturulurken hata: %s\n"
@@@ -402,47 -325,32 +410,47 @@@ msgstr "
  "@Seçenekler:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  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:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "sunucu olarak (önalanda) çalışır"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "sunucu kipinde çalışır"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: 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:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sh tarzı komut çıktısı"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "csh tarzı komut çıktısı"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "konsoldan kopulmaz"
  
@@@ -525,11 -416,6 +533,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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 <"
@@@ -552,48 -436,35 +560,48 @@@ 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:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, 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:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, 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:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "soket oluşturulamıyor: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
@@@ -603,29 -473,23 +611,29 @@@ msgstr "soketin ismi `%s' çok uzun\n
  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:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "soket için tuz alınırken hata\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, 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:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "soket dinleme başarısız: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
@@@ -657,7 -515,6 +665,7 @@@ msgstr "%s için stat() başarısız ol
  msgid "can't use '%s' as home directory\n"
  msgstr "`%s' ev dizini olarak kullanılamıyor\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
@@@ -682,13 -535,11 +690,13 @@@ msgstr "ssh tutamağı 0x%lx, fd %d iç
  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:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, 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:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s durdu\n"
@@@ -711,8 -558,6 +719,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:424 kbx/kbxutil.c:71 sm/gpgsm.c:198
- #: dirmngr/dirmngr.c:153 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -720,9 -565,6 +728,9 @@@ msgstr "
  "@Komutlar:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -778,8 -612,6 +786,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -846,8 -669,6 +854,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Evet"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Hayır"
  
@@@ -902,7 -716,6 +910,7 @@@ msgstr "Anahtar parolasını değiştir
  msgid "I'll change it later"
  msgstr "Sonra değiştireceğim"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -910,13 -723,11 +918,13 @@@
  "%%0A?"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "anahtarı kullanıma sokar"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -937,7 -745,6 +945,7 @@@ msgstr "%s anahtarı, güvensiz bir çi
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@@ -964,23 -767,15 +972,23 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "süreç çatallanırken hata: %s\n"
@@@ -996,8 -789,6 +1004,8 @@@ msgstr "süreç %d sonlanacak diye bekl
  msgid "error running '%s': probably not installed\n"
  msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
@@@ -1009,13 -799,11 +1017,13 @@@ msgstr "`%s' çalışırken hata: çık
  msgid "error running '%s': terminated\n"
  msgstr "`%s' çalışırken hata: sonlandırıldı\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
@@@ -1244,8 -986,6 +1252,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "desteklenmeyen algoritma: %s"
@@@ -1368,7 -1081,10 +1376,12 @@@ msgstr "bozuk satır yok sayılıyor
  msgid "[none]"
  msgstr "[yok]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "geçersiz radix64 karakteri %02x atlandı\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "değiştirge beklenmiyordu"
  
@@@ -1437,7 -1139,6 +1450,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:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "nüve dışında\n"
  
@@@ -1500,8 -1190,6 +1513,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:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@@ -1669,8 -1324,6 +1682,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 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 -1330,9 +1691,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:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Seçiminiz? "
  
@@@ -1747,17 -1380,11 +1760,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "\"%s\" okunurken hata: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "`%s' yazılırken hata: %s\n"
@@@ -1817,7 -1431,6 +1830,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:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
@@@ -1848,13 -1456,10 +1861,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:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
@@@ -1913,9 -1508,6 +1926,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Seçim geçersiz.\n"
  
@@@ -2042,23 -1605,15 +2055,23 @@@ msgstr "Komut geçersiz (\"help\" komut
  msgid "--output doesn't work for this command\n"
  msgstr "--output seçeneği bu komutla çalışmaz\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1662,6 +2132,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@@ -2159,7 -1695,6 +2172,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:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2286,39 -1797,30 +2299,39 @@@ msgstr "ihraç sırasında anahtardan m
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: atlandı: %s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "\"%s\"e yazıyor\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "gizli anahtarların ihracına izin verilmez\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2596,7 -2037,6 +2609,7 @@@ msgstr "|N|sıkıştırma seviyesi N ol
  msgid "use canonical text mode"
  msgstr "kurallı metin kipini kullanır"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|DOSYA|çıktı DOSYAya yazılır"
  
@@@ -2794,478 -2206,380 +2807,482 @@@ msgstr "UYARI: '%s' eklentisini içere
  msgid "unknown configuration item '%s'\n"
  msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, 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:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  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:1943
++#: g10/gpg.c:1945
  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:1945
++#: g10/gpg.c:1947
  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:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, 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:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "`%s' seçeneği bilinmiyor\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, 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:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 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:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "içselleştirme seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "dışsallaştırma seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  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:3235
++#: g10/gpg.c:3239
  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:3237
++#: g10/gpg.c:3241
  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:3239
++#: g10/gpg.c:3243
  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:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "imzaları PKA verisi ile doğrular"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  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:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, 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:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 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:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "UYARI: %s %s'i aşıyor\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ile %s birlikte kullanılmaz!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s, %s ile etkisiz olur!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, 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:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 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:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  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:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  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:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  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:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "öntanımlı tercihler geçersiz\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "kişisel şifre tercihleri geçersiz\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "kişisel özet tercihleri geçersiz\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s, %s ile henüz çalışmıyor\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, 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:3967
++#: g10/gpg.c:3971
  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:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  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:4070
++#: g10/gpg.c:4074
  #, 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:4127
++#: g10/gpg.c:4131
  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:4130
++#: g10/gpg.c:4134
  #, 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:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 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:4477
++#: g10/gpg.c:4481
  #, 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:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, 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:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "anahtar sunucusunda arama başarısız: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "zırhın kaldırılması başarısız: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "zırhlama başarısız: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, 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:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "İletinizi yazın ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "belirtilen sertifika güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "belirtilen imza güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|durum bilgisini bu FD'ye yazar"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4631,14 -3680,9 +4648,14 @@@ 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:4150 g10/keyedit.c:4581 g10/keyserver.c:548
- #: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:407 g10/trust.c:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "yürürlükten kaldırıldı"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "zamanaşımına uğradı"
  
@@@ -4678,7 -3716,6 +4695,7 @@@ msgstr "Onu yine de eklemek istiyor mus
  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:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4710,7 -3741,6 +4727,7 @@@ msgstr[1] "%d imza silindi.\n
  msgid "Nothing deleted.\n"
  msgstr "Hiçbir şey silinmedi.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "geçersiz"
  
@@@ -4965,73 -3947,57 +4982,73 @@@ 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:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "'%s' tercihi yinelendi\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "çok fazla şifreleme tercihi\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "çok fazla özet tercihi\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "çok fazla sıkıştırma tercihi\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "doğrudan imza yazılıyor\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "öz-imza yazılıyor\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "anahtarı garantileyen imzayı yazıyor\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  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:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "İmzalama"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Onayla"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Şifrele"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Kimlik kanıtla"
  
@@@ -5045,159 -4011,128 +5062,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "OoŞşKkçÇ"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "bir %s anahtarı için olası eylemler: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Şimdilik mümkün eylemler: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Bitti\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (yalnız imzalamak için)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (sadece imzalamak için)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (sadece şifrelemek için)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, 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:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, 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:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Mevcut anahtar\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Simgelemi giriniz: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, 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:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "İstenen anahtar uzunluğu: %u bit\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5213,7 -4148,6 +5230,7 @@@ msgstr "
  "      <n>m = anahtar n ay geçerli\n"
  "      <n>y = anahtar n yıl geçerli\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5229,38 -4163,30 +5246,38 @@@ msgstr "
  "      <n>m = imza n ay geçerli\n"
  "      <n>y = imza n yıl geçerli\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Anahtar ne kadar geçerli olacak? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "İmza ne kadar geçerli olacak? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "değer hatalı\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Anahtar hep geçerli olacak\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "İmza hep geçerli olacak\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Anahtarın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "İmzanın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5268,11 -4194,9 +5285,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:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Bu doğru mu? (e/H ya da y/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5287,7 -4211,6 +5304,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5303,50 -4226,39 +5320,50 @@@ msgstr "
  "\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Adınız ve Soyadınız: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Ad ve soyadınızda geçersiz karakter var\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  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:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "E-posta adresiniz: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "geçerli bir E-posta adresi değil\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Önbilgi: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Önbilgi alanında geçersiz karakter var\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5357,7 -4269,6 +5374,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  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"
@@@ -5373,37 -4284,30 +5390,37 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "AaYyEeTtKk"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  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:2749
++#: g10/keygen.c:2734
  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:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Lütfen önce hatayı düzeltin\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5416,13 -4320,10 +5433,13 @@@ msgstr "
  "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
  "üretecine yardımcı olur. \n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5430,71 -4331,58 +5447,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, 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:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Anahtar üretimi durduruldu.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, 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:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5502,14 -4390,12 +5519,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:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, 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:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5517,22 -4403,18 +5534,22 @@@ msgstr "
  "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
  "problemi)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  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:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
  
@@@ -5613,13 -4479,11 +5630,13 @@@ msgstr "     Anahtar parmakizi =
  msgid "      Card serial no. ="
  msgstr "      Kart seri no. ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "`%s' anahtar zinciri önbellekleniyor\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5627,14 -4491,12 +5644,14 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
  msgstr[1] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5642,7 -4504,6 +5659,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 kötü imza\n"
  msgstr[1] "1 kötü imza\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: anahtar zinciri oluşturuldu\n"
@@@ -5945,7 -4744,6 +5962,7 @@@ msgstr "ikili
  msgid "textmode"
  msgstr "metinkipi"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "bilinmeyen"
  
@@@ -6167,62 -4923,51 +6184,62 @@@ msgstr "UYARI: simetrik şifreli oturu
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "aracı ile sorun var: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Anahtar parolasını giriniz\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "kullanıcı tarafından durduruldu\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (asıl anahtar kimliği %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr ""
  "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6660,18 -5322,15 +6677,18 @@@ msgstr "DEK'in eski kodlaması destekle
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6982,7 -5592,6 +6999,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s imza: \"%s\" den\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6990,11 -5599,9 +7007,11 @@@ msgstr "
  "UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
  "isteniyor\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "imzalanıyor:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s şifrelemesi kullanılmayacak\n"
@@@ -7052,19 -5648,16 +7069,19 @@@ msgstr "parmakizi geçersiz
  msgid "ownertrust value missing"
  msgstr "sahibiningüvencesi değeri kayıp"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "`%s' için okuma hatası: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
@@@ -7100,7 -5687,6 +7117,7 @@@ msgstr "güvence veritabanı işlemi ç
  msgid "%s: directory does not exist!\n"
  msgstr "%s: dizin yok!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7245,10 -5803,6 +7262,10 @@@ msgstr "geçici dosya oluşturulurken h
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -7283,7 -5832,6 +7300,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "'%s' açılırken hata: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7462,11 -5983,9 +7479,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7476,79 -5994,67 +7493,79 @@@
  msgid "resetting keydb: %s\n"
  msgstr "anahtarı yazarken hata: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "bayraklar saklanırken hata: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "%d imza silindi.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
@@@ -7556,13 -6062,11 +7573,13 @@@ msgid_plural "%s: Verified %ld~signatur
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "%lu anahtar parolası ile şifrelenmiş\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
@@@ -7570,31 -6074,25 +7587,31 @@@ msgid_plural "Encrypted %ld~messages i
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "geçerliliği: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7611,19 -6109,15 +7628,19 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, 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:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7673,53 -6158,43 +7690,53 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, 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:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s güvence modeli kullanılıyor\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "bir güvence veritabanı denetimi gereksiz\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sonraki güvence veritabanı denetimi %s de\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "genel anahtar %s yok: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "lütfen bir --check-trustdb yapın\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "güvence veritabanı denetleniyor\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7727,7 -6202,6 +7744,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:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7735,16 -6209,13 +7752,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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "son derece güvenli bir anahtar yok\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, 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:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7752,7 -6223,6 +7769,7 @@@ msgstr "
  "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7870,19 -6319,14 +7887,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:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@@ -7931,7 -6366,6 +7948,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
@@@ -7946,70 -6378,70 +7963,87 @@@ msgstr "parmakizinin saklanması başar
  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:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "karttan CHV durumu alınırken hata\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "yanıt RSA modülü içermiyor\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "yanıt RSA genel bileşenini içermiyor\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "yanıt genel anahtar verisi içermiyor\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "genel anahtar okuması başarısız: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, 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:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, 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:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "karttan CHV durumu alınırken hata\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "kart kalıcı olarak kilitli!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -8021,28 -6453,20 +8055,25 @@@ msgstr[1] "
  "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\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:2086
- #, 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:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  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:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Lütfen PIN'i giriniz"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, 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"
@@@ -8050,83 -6474,65 +8081,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|YSK|Yeni Sıfırlama Kodu"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|YYP|Yeni Yönetici PIN'i"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Yeni PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "uygulama verisi okunurken hata\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "parmakizi DO okunurken hata\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "mevcut anahtar konulacak\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "oluşturum zaman damgası kayıp\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, 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:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "anahtarın saklanması başarısız: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "desteklenmeyen algoritma: %s"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "anahtar üretimi başarısızlığa uğradı\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8134,30 -6540,24 +8165,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:3853
++#: scd/app-openpgp.c:4008
  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:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kart %s özet algoritmasını desteklemiyor\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  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:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@@ -8179,56 -6576,44 +8210,56 @@@ 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:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|DOSYA|DOSYAya bir günce yazar"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|N. porttaki okuyucuya bağlanır"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "dahili CCID sürücüsü kullanılmaz"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  #, fuzzy
  #| msgid "do not use a reader's keypad"
  msgid "do not use a reader's pinpad"
  msgstr "bir okuyucu tuştakımı kullanılmaz"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "yönetici kartı komutları kullanımına izin verir"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, 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:288
++#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8249,22 -6633,14 +8280,17 @@@ msgstr "
  "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
  "kullanın\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %d için eylemci başlatıldı\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %d için eylemci sonlandı\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "geçersiz radix64 karakteri %02x atlandı\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -8283,12 -6656,10 +8309,12 @@@ msgstr "zincir
  msgid "shell"
  msgstr "kabuk"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "kritik sertifika eklentisi %s desteklenmiyor"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "sertifikacı onu bir CA gibi imlememiş"
  
@@@ -8302,13 -6671,11 +8328,13 @@@ msgstr "yapılandırılmış poliçele
  msgid "failed to open '%s': %s\n"
  msgstr "`%s' açılamadı: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "sertifika poliçesine izin verilmiyor"
  
@@@ -8335,9 -6697,6 +8361,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8358,12 -6713,10 +8384,12 @@@ msgstr "\"dirmngr\"'ın düzgün olara
  msgid "checking the CRL failed: %s"
  msgstr "CRL sınaması başarısız: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "geçersiz doğrulukla sertifika: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "sertifika henüz geçersiz"
  
@@@ -8375,7 -6726,6 +8401,7 @@@ msgstr "kök sertifika henüz geçersiz
  msgid "intermediate certificate not yet valid"
  msgstr "ara sertifika henüz geçersiz"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "sertifika kullanım süresi dolmuş"
  
@@@ -8424,7 -6763,6 +8450,7 @@@ msgstr "  (sertifika geçerlilik başla
  msgid "  (     issuer valid from "
  msgstr "  (sertifikacı geçerlilik başlangıcı: "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "parmakizi=%s\n"
@@@ -8454,7 -6786,6 +8480,7 @@@ msgstr "sertifikacı kim belli değil
  msgid "self-signed certificate has a BAD signature"
  msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "kök sertifika güvenilir olarak imli değil"
  
@@@ -8463,28 -6793,22 +8489,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "güvence listesinin sınanması başarısız: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "sertifika zinciri çok uzun\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "sertifikacı belli değil"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "sertifika KÖTÜ bir imzaya sahip"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "sertifika iyi durumda\n"
  
@@@ -8510,11 -6829,9 +8536,11 @@@ msgstr "kullanılan geçerlilik modeli
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(bu, MD2 algoritmasıdır)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "yok"
  
@@@ -8549,44 -6861,36 +8575,44 @@@ msgstr "
  "S/N: %s, Kimlik: 0x%08lX,\n"
  "oluşturuluşu: %s, süre bitimi: %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  #, fuzzy
  #| msgid "certificate should have not been used for certification\n"
  msgid "certificate should not have been used for certification\n"
  msgstr "sertifika onaylama için kullanılmamalıydı\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  #, fuzzy
  #| msgid "certificate should have not been used for encryption\n"
  msgid "certificate should not have been used for encryption\n"
  msgstr "sertifika şifreleme için kullanılmamalıydı\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for signing\n"
  msgstr "sertifika imzalama için kullanılmamalıydı\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "sertifika şifreleme için elverişli değil\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "sertifika imzalama için elverişli değil\n"
  
@@@ -8693,7 -6979,6 +8719,7 @@@ msgstr "%d. satır: `%s' anahtar maşas
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "%d. satır: anahtar üretimi başarısızlığa uğradı: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8701,65 -6986,52 +8727,65 @@@ msgstr "
  "Bu sertifika isteğini tamamlamak için lütfen anahtar parolanızı girip "
  "anahtarınızı bir kere daha oluşturun.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Mevcut anahtar\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Karttaki mevcut anahtar\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s: serbest kaydı okuma hatası: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "kartın seri numarası alınırken hata: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "anahtarı iptal eder"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "bir %s anahtarı için olası eylemler:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) imza, şifreleme\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) imza\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) şifreleme\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "X.509 konu ismini girin: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Konu ismi belirtilmemiş\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8770,37 -7042,29 +8796,37 @@@ msgstr "Geçersiz konu ismi yaftası `%
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
  msgstr "Geçersiz konu ismi`%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "22 çevirmen: bakınız certreg-ui.c:gpgsm_gencertreq_tty"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "E-posta adresinizi girin"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (ve boş bir satır ile bitirin):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "DNS isimlerini giriniz"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (seçimlik; boş bir satır işlemi sonlandırır):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "URI'leri girin"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
@@@ -8808,43 -7072,34 +8834,43 @@@ msgstr "
  "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
  "da y/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
  msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
  msgstr "Sertifika isteği oluşturuluyor.  Bu biraz vakit alabilir...\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "Hazır.  Bu isteği şimdi Sertifika Yetkilinize (CA) göndermelisiniz.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "özkaynak sorunu: nüve dışı\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(bu, RC2 algoritmasıdır)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
  
@@@ -8982,7 -7206,6 +9008,7 @@@ msgstr "
  "|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
  "kullanılır"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
  
@@@ -9075,17 -7282,14 +9101,17 @@@ msgstr "sertifika saklanırken hata\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "saklanmış bayraklar alınırken hata: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "sertifika ithal edilirken hata: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "girdi okunurken hata: %s\n"
@@@ -9155,7 -7348,6 +9181,7 @@@ msgstr "
  "\n"
  "%s%sBunu yapmak istediğinizden emin misiniz?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -9174,180 -7365,151 +9200,186 @@@ msgstr "
  "\"%s\"\n"
  "Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "çittirim algoritması %d (%s) imzacı %d için desteklenmiyor; %s kullanılıyor\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "%d imzacı için kullanılan çittirim algoritması: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "nitelikli sertifika için sınama başarısız: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "İmza "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[belirtilmeyen tarihte]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " sertifika kimliği 0x%08lX kullanılarak yapıldı\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr "geçersiz imza: ileti özeti özelliği hesaplananla uyuşmuyor\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Buradaki imzeler iyi:"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "        nam-ı diğer"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Bu bir nitelikli imzadır.\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "nitelikli sertifika için sınama başarısız: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
  msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "\"%s\" oluşturulamıyor: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
  msgstr "sertifika `%s' silindi\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
  msgstr "yinelenmiş sertifika `%s' silindi\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
  msgstr "sertifika `%s' silindi\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "parmakizi=%s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
  msgstr "İçerilen sertifikalar"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
  msgstr "eşleşen sertifika sayısı: %d\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "number of matching certificates: %d\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "eşleşen sertifika sayısı: %d\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
  msgstr "  (  sertifikanın oluşturuluşu: "
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate cached\n"
  msgstr "sertifika iyi durumda\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "parmakizi geçersiz"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
  msgstr "sertifikacı kim belli değil"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
@@@ -9389,7 -7545,6 +9421,7 @@@ msgstr "satır alımı başarısız: %s
  msgid "not removing file '%s'\n"
  msgstr "zırhlama başarısız: %s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9634,7 -7745,6 +9666,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "saklanmış bayraklar alınırken hata: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9649,13 -7757,11 +9681,13 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "converting S-expression failed: %s\n"
  msgstr "iconv_open başarısız: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "creating S-expression failed: %s\n"
@@@ -9710,163 -7807,134 +9742,163 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "imza doğrulama engellendi\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "read başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "geçici dosya oluşturulurken hata: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "gizliyi güncelleme başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "geçeci dosyaya yazma hatası: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "geçici dosya oluşturulurken hata: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
  msgstr "girdi okunurken hata: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid notation data found\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: serbest kaydı okuma hatası: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
  msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "read başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "güvence listesinin sınanması başarısız: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
@@@ -9876,54 -7943,42 +9908,54 @@@ msgstr "satır alımı başarısız: %s
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s: dizin kaydını yazma hatası: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "çok fazla şifreleme tercihi\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
  msgstr "`%s' %s üzerinden alınırken hata: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
  msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "sertifika \"%s\" yok: %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate search not possible due to disabled %s\n"
@@@ -10090,126 -8116,98 +10122,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, 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:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "dirmngr'a bir komut aktarır"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, 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:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "PKA aramalarına izin verilir (DNS istekleri)"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSYA|seçenekler DOSYAdan okunur"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 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:210
++#: dirmngr/dirmngr.c:212
  #, 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:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10222,13 -8220,11 +10254,13 @@@ msgstr "
  "@\n"
  "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, 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:363
++#: dirmngr/dirmngr.c:383
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10240,88 -8236,71 +10272,88 @@@ msgstr "
  "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
  "GnuPG için gizli anahtar yönetimi\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, 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:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "kullanımı: gpgsm [seçenekler] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, 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:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, 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 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "zorlanmadı"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10577,40 -8508,33 +10609,40 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: dosya sürümü %d geçersiz\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
  msgstr "iconv_open başarısız: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "gizliyi güncelleme başarısız: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10648,287 -8566,231 +10680,283 @@@ msgstr "bayraklar saklanırken hata: %s
  msgid "error building OCSP request: %s\n"
  msgstr "`%s' yüklenirken hata: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
  msgstr "`%s' yazılırken hata: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "%s okunurken hata: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
  msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "soket `%s'e bağlanırken hata: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "güvence listesinin sınanması başarısız: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
  msgstr "satır alımı başarısız: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
  msgstr "sertifikacı belli değil"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
  msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
  msgstr "sertifika saklanırken hata\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "'%s' erişilemiyor: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
  msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "%s şifrelemesi kullanılıyor\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "sertifika yürürlükten kaldırılmıştı"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "satır göndirimi başarısız: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "satır göndirimi başarısız: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, 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:2523
++#: dirmngr/server.c:2591
  #, 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:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "imzalama başarısız: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
  msgstr "sertifikacı onu bir CA gibi imlememiş"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "güvence veritabanı denetleniyor\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
  msgstr "CRL sınaması başarısız: %s"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
  msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "nitelikli sertifika için sınama başarısız: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
  msgstr "sertifika iyi durumda\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr ""
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
@@@ -11036,196 -8877,149 +11064,196 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  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:723
- #: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:901
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  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:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Güvenliği denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|yeni anahtar parolası için gereken en küçük uzunluk N'ye ayarlanır"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  "|N|yeni bir anahtar parolası için en azından harf olmayan N karakter gerekir"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  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:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Anahtar sunucular için yapılandırma"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "PKA aramalarına izin verilir (DNS istekleri)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  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:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "dirmngr'a tüm erişim iptal edilir"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  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:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "kök sertifikalar için CRLler sınanmaz"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Çıktı biçimini denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Güvenliği denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "HTTP sunucuları için yapılandırma"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "sistemin HTTP vekil ayarları kullanılır"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Kullanılacak LDAP sunucularının yapılandırması"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAP sunucu listesi"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "OCSP için yapılandırma"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "Bad Passphrase"
  msgid "Passphrase Entry"
  msgstr "Anahtar Parolası hatalı"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Bileşen yok"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, 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:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, 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:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/uk.po
index 29d0546,e38dd37..87ab3a5
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,8 -7,7 +7,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-01-23 21:37+0100\n"
- "PO-Revision-Date: 2016-07-10 15:11+0300\n"
++"POT-Creation-Date: 2017-03-01 16:34+0100\n"
+ "PO-Revision-Date: 2017-01-27 14:10+0200\n"
  "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
  "Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
  "Language: uk\n"
@@@ -19,7 -18,6 +19,7 @@@
  "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
  "X-Generator: Lokalize 1.5\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "не вдалося встановити блокування запису пінкоду: %s\n"
@@@ -30,45 -28,35 +30,45 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "_Гаразд"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "_Скасувати"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr "_Так"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr "_Ні"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "Пінкод:"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Зберегти у засобі керування паролями"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Справді хочете зробити пароль видимим на екрані?"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "Зробити пароль видимим"
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "Приховати пароль"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "Якість:"
  
@@@ -78,13 -66,11 +78,13 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Якість введеного вище тексту.\n"
  "Дані щодо критеріїв якості можна отримати у вашого адміністратора."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -92,7 -78,6 +92,7 @@@ msgstr "
  "Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
  "сеансу"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -100,53 -85,40 +100,53 @@@ msgstr "
  "Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
  "сеансу"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr "Пінкод:"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Пароль:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "паролі не збігаються, повторіть спробу"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (спроба %d з %d)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "Повторіть:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "Занадто довгий пінкод"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "Занадто довгий пароль"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "Некоректні символи у пінкоді"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "Занадто короткий пінкод"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "Помилковий пінкод"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "Помилковий пароль"
  
@@@ -156,49 -127,35 +156,57 @@@ 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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не вдалося відкрити «%s»: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "помилка під час спроби отримання серійного номера картки: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "виявлено картку з серійним номером: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "на карті немає ключа розпізнавання для SSH: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "не виявлено відповідних ключів картки: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -207,24 -164,19 +215,24 @@@ msgstr "
  "Процесом ssh надіслано запит щодо використання ключа%%0A  %s%%0A  "
  "(%s)%%0AНадати доступ до цього ключа?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "Надати"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "Заборонити"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Будь ласка, вкажіть пароль до ключа ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Будь ласка, повторіть введення пароля"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -233,68 -185,53 +241,68 @@@ msgstr "
  "Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A   %s"
  "%%0A   %s%%0Aу сховищі ключів gpg-agent"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "не вдалося створити потік даних з сокета: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "Будь ласка, вставте картку з серійним номером"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "Адміністративний пінкод"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PUK"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "Код скидання"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "Повторіть введення цього коду скидання"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "Повторіть введення цього PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "Повторіть введення цього пінкоду"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "Помилка під час повторного введення коду скидання, повторіть спробу"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "Помилка під час повторного введення PUK, повторіть спробу"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "Помилка під час повторного введення пінкоду, повторіть спробу"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Будь ласка, введіть пінкод%s%s%s для розблокування картки"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "помилка створення тимчасового файла: %s\n"
@@@ -377,47 -300,30 +385,45 @@@ msgstr "
  "@Параметри:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "запустити у режимі фонової служби (фоновий)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "запустити у режимі сервера (основному)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
- #, fuzzy
- #| msgid "run in server mode"
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  msgid "run in supervised mode"
- msgstr "запустити у режимі сервера"
+ msgstr "запустити у режимі із наглядом"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "дещо зменшити кількість повідомлень"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "виведення команд у форматі sh"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "виведення команд у форматі csh"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|прочитати параметри з вказаного файла"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "не від’єднувати від консолі"
  
@@@ -492,11 -381,6 +498,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
  
@@@ -512,43 -394,30 +518,43 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
  "Керування закритими ключами у @GNUPG@\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "вказано некоректне значення рівня діагностики «%s»\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметрів «%s»: %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "прочитати параметри з «%s»\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не вдалося створити сокет: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "назва сокета «%s» є надто довгою\n"
@@@ -557,27 -425,21 +563,27 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "помилка під час спроби отримання поточного стану сокета\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не вдалося встановити права доступу до «%s»: %s\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "помилка listen(): %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "очікування даних на сокеті «%s»\n"
@@@ -604,7 -460,6 +610,7 @@@ msgstr "помилка stat() щодо 
  msgid "can't use '%s' as home directory\n"
  msgstr "не можна використовувати як домашній каталог «%s»\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr ""
@@@ -631,12 -482,10 +637,12 @@@ msgstr "запущено обробни
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "помилка pth_select: %s — очікування у 1 с\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s зупинено\n"
@@@ -659,8 -504,6 +665,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
  "Керування кешем паролів\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -668,9 -511,6 +674,9 @@@ msgstr "
  "@Команди:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -724,8 -556,6 +730,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -785,8 -606,6 +791,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Так"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "Ні"
  
@@@ -841,7 -653,6 +847,7 @@@ msgstr "Змінити пароль
  msgid "I'll change it later"
  msgstr "Я зміню його пізніше"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -849,11 -660,9 +855,11 @@@
  msgstr ""
  "Справді хочете вилучити ключ, що визначається keygrip%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "Вилучити ключ"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -876,7 -682,6 +882,7 @@@ msgstr "Ключ %s використо�
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu-бітовий хеш не є коректним для %u-бітового ключа %s\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "невдала спроба перевірити створений підпис: %s\n"
@@@ -901,22 -702,14 +907,22 @@@ msgstr "підтримки алгори
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "помилка під час спроби створення каналу: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "помилка під час спроби створення потоку для каналу: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@@ -932,8 -723,6 +938,8 @@@ msgid "error running '%s': probably no
  msgstr ""
  "помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
@@@ -943,12 -731,10 +949,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "не вдалося дочекатися переривання процесу: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
@@@ -977,13 -758,10 +983,12 @@@ msgstr "Увага: визначенн�
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
  
 +#: common/sysutils.c:693
- #, fuzzy, c-format
- #| msgid "waiting for the agent to come up ... (%ds)\n"
+ #, c-format
  msgid "waiting for file '%s' to become accessible ...\n"
- msgstr "очікування на працездатність агента… (%d с)\n"
+ msgstr "очікуємо на отримання доступу до файла «%s»…\n"
  
 +#: common/sysutils.c:719
  #, c-format
  msgid "renaming '%s' to '%s' failed: %s\n"
  msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
@@@ -1163,8 -902,6 +1168,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "непідтримуваний алгоритм: %s"
@@@ -1284,7 -994,10 +1289,12 @@@ msgstr "ігноруємо беззмі
  msgid "[none]"
  msgstr "[немає]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "пропущено некоректний символ radix64 %02x\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "неочікуваний аргумент"
  
@@@ -1350,7 -1049,6 +1360,7 @@@ msgstr "параметр «%.50s» є �
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда «%.50s» є неоднозначною\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "вихід за межі області пам’яті\n"
  
@@@ -1408,8 -1095,6 +1418,8 @@@ msgstr "блокування «%s» н�
  msgid "waiting for lock %s...\n"
  msgstr "очікування на блокування %s…\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@@ -1564,8 -1216,6 +1574,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "це не можна робити у пакетному режимі\n"
  
@@@ -1573,14 -1222,9 +1583,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Цією командою можна користуватися лише для карток версії 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "Ваш вибір? "
  
@@@ -1643,16 -1273,10 +1653,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "помилка під час спроби читання «%s»: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1714,7 -1325,6 +1724,7 @@@ msgstr "дія над ключем не
  msgid "not an OpenPGP card"
  msgstr "не є карткою OpenPGP"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "помилка під час отримання даних поточного ключа: %s\n"
@@@ -1749,13 -1354,10 +1759,13 @@@ msgstr "Яким має бути роз
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
@@@ -1810,9 -1402,6 +1820,9 @@@ msgstr "   (2) Ключ шифрува�
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ розпізнавання\n"
  
 +#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "Некоректний вибір.\n"
  
@@@ -1936,22 -1496,14 +1946,22 @@@ msgstr "Некоректна коман
  msgid "--output doesn't work for this command\n"
  msgstr "--output не працює з цією командою\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1549,6 +2019,7 @@@ msgid "use option \"--delete-secret-key
  msgstr ""
  "спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
  
- #: g10/encrypt.c:232 g10/sign.c:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "помилка під час спроби створення пароля: %s\n"
@@@ -2046,7 -1579,6 +2056,7 @@@ msgstr "
  "УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
  "параметрам отримувача\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2170,40 -1679,30 +2180,40 @@@ msgstr "вилучити невикор
  msgid "remove as much as possible from key during export"
  msgstr "вилучити максимум частин з ключа під час експортування"
  
 +#: g10/export.c:120
  msgid "use the GnuPG key backup format"
- msgstr ""
+ msgstr "використовувати формат резервних копій ключів GnuPG"
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "записуємо до «%s»\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "експортування закритих ключів заборонено\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "УВАГА: нічого не експортовано\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2345,13 -1812,9 +2355,11 @@@ msgstr "швидке додаванн�
  msgid "quickly revoke a user-id"
  msgstr "швидке відкликання ідентифікатора користувача"
  
 +#: g10/gpg.c:462
- #, fuzzy
- #| msgid "quickly generate a new key pair"
  msgid "quickly set a new expiration date"
- msgstr "швидке створення пари ключів"
+ msgstr "швидке встановлення нової дати завершення строку дії"
  
 +#: g10/gpg.c:464
  msgid "full featured key pair generation"
  msgstr "повноцінне створення пари ключів"
  
@@@ -2465,7 -1901,6 +2473,7 @@@ msgstr "|N|встановити рів�
  msgid "use canonical text mode"
  msgstr "використовувати канонічний текстовий режим"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|записати дані до вказаного файла"
  
@@@ -2490,17 -1921,6 +2498,7 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man))\n"
  
 +#: 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"
@@@ -2654,471 -2051,370 +2652,472 @@@ msgstr "
  msgid "unknown configuration item '%s'\n"
  msgstr "невідомий пункт налаштувань «%s»\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "показувати фотоідентифікатори у списках ключів"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "показувати дані щодо використання ключа у списках ключів"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "показувати адреси правил у списках підписів"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "показувати всі примітки у списках підписів"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "показувати стандартні примітки IETF у списках підписів"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "показувати примітки користувача у списках підписів"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показувати адреси основних серверів ключів у списках підписів"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "ключів"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показувати відкликані та застарілі підключі у списках ключів"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "показувати назву сховища ключів у списках ключів"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "показувати дати завершення строків дії у списку підписів"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2053 g10/gpg.c:2090
+ #, c-format
  msgid "valid values for option '%s':\n"
- msgstr "некоректний аргумент параметра «%.50s»\n"
+ msgstr "коректні значення параметра «%s»:\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "невідомі правила TOFU «%s»\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr "(команда «help» виводить список можливих варіантів)\n"
  
- #: g10/gpg.c:2098 g10/keygen.c:167
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2100 g10/keygen.c:168
+ #, c-format
  msgid "invalid value for option '%s'\n"
- msgstr "некоректний аргумент параметра «%.50s»\n"
+ msgstr "некоректне значення параметра «%s»\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
  
- #: g10/gpg.c:3045
- #, fuzzy, c-format
- #| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3047
+ #, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "рядок %d: некоректна адреса електронної пошти\n"
+ msgstr "«%s» не є коректною адресою електронної пошти\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "некоректний режим pinentry, «%s»\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» не є коректним набором символів\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "не вдалося обробити адресу сервера ключів\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "некоректний параметр фільтрування: %s\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: некоректні параметри експортування\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "некоректні параметри експортування\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "показувати фотоідентифікатори під час перевірки підписів"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "показувати адреси правил під час перевірки підписів"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "показувати всі примітки під час перевірки підписів"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "показувати стандартні примітки IETF під час перевірки підписів"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "показувати вказані користувачем примітки під час перевірки підписів"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "показувати адреси основних серверів ключів у списках перевірки підписів"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr ""
  "показувати чинність ідентифікаторів користувача під час перевірки підписів"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "перевірки підписів"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr ""
  "показувати лише основний ідентифікатор користувача під час перевірки підписів"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "перевірити підписи за допомогою даних PKA"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "підняти рівень довіри до підписів з коректними даними PKA"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не вдалося встановити шлях для запуску у значення %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "УВАГА: %s перевизначає %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s не можна використовувати разом з %s!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s є зайвим, якщо використано %s!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "УВАГА: запущено з фіктивним системним часом: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "вибраний алгоритм шифрування є некоректним\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "вибраний алгоритм стискання є некоректним\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
  "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "значення completes-needed має бути більшим за 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "значення marginals-needed має перевищувати 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
  
- #: g10/gpg.c:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr ""
  "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
  "S2K (0)\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "некоректні типові параметри\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "некоректні особисті параметри шифрування\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "некоректні особисті параметри контрольної суми\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "некоректні особисті параметри стискання\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ще не може працювати разом з %s\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
  "%s\n"
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
  "ключем\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
  "mode 0\n"
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
  "s2k-mode 0\n"
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
  "%s\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "помилка під час спроби експортування ключа: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "помилка пошуку на сервері ключів: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "помилка оновлення з сервера ключів: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "помилка перетворення з формату ASCII: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "помилка перетворення у формат ASCII: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "некоректний алгоритм хешування «%s»\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "Почніть вводити ваше повідомлення...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "вказана адреса правил сертифікації є некоректною\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "вказана адреса правил підписування є некоректною\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "вказана адреса основного сервера ключів є некоректною\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|визначити ключі з файла сховища ключів ФАЙЛ"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|записувати до дескриптора файла дані щодо стану"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|відкидати підписи, створені за допомогою алгоритму ALGO"
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3171,13 -2456,9 +3170,11 @@@ msgstr "вилучити максиму
  msgid "run import filters and export key immediately"
  msgstr "запустити фільтри імпортування та експортувати ключ негайно"
  
 +#: g10/import.c:179
- #, fuzzy
- #| msgid "assume input is in binary format"
  msgid "assume the GnuPG key backup format"
- msgstr "вважати вхідні дані даними у двійковому форматі"
+ msgstr "припускати формат резервних копій ключів GnuPG"
  
 +#: g10/import.c:341 g10/import.c:583
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропускаємо блок типу %d\n"
@@@ -4323,13 -3373,10 +4320,12 @@@ msgstr "Немає відповідни
  msgid "Nothing to sign.\n"
  msgstr "Нічого підписувати.\n"
  
 +#: g10/keyedit.c:3388
- #, fuzzy, c-format
- #| msgid "'%s' is not a valid signature expiration\n"
+ #, c-format
  msgid "'%s' is not a valid expiration time\n"
- msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
+ msgstr "«%s» не є коректним записом завершення строку дії\n"
  
 +#: g10/keyedit.c:3508
  msgid "Digest: "
  msgstr "Контрольна сума: "
  
@@@ -4420,14 -3448,9 +4416,14 @@@ msgstr "
  "Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
  "до перезапуску програми.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "відкликано"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "збіг строк дії"
  
@@@ -4467,7 -3484,6 +4463,7 @@@ msgstr "Ви справді бажає�
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
  
@@@ -4499,7 -3509,6 +4495,7 @@@ msgstr[2] "Вилучено %d підп
  msgid "Nothing deleted.\n"
  msgstr "Нічого не вилучено.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "некоректний"
  
@@@ -4738,71 -3699,55 +4734,71 @@@ msgstr "Підключ %s вже від
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "запис переваги «%s» продубльовано\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "занадто багато записів переваг шифрів\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "занадто багато записів переваг контрольних сум\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "занадто багато записів переваг стискання\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "некоректний запис «%s» у рядку переваг\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "записування безпосереднього підпису\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "записування самопідпису\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "записування підпису прив’язування ключа\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "розмір ключа округлено до %u-бітового\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
  "розміром контрольної суми\n"
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "Підписати"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "Сертифікувати"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "Зашифрувати"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "Пройти розпізнавання"
  
@@@ -4816,151 -3761,120 +4812,151 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Можливі дії з ключем %s: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "Поточні дозволені дії: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість підписування\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість шифрування\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  "   (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) вийти\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "Вкажіть потрібний вам тип ключа:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA і RSA (типовий)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA і Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (лише підписування)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (лише підписування)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (лише шифрування)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (лише шифрування)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC та ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (лише підписування)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (лише шифрування)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Вже записаний ключ\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "Вкажіть keygrip: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "Немає ключів з таким значенням keygrip\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Якою має бути довжина підключа? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Якою має бути довжина ключа? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запитана довжина ключа — %u бітів\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Вкажіть потрібну вам еліптичну криву:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4976,7 -3890,6 +4972,7 @@@ msgstr "
  "      <n>m = строк чинності у n місяців\n"
  "      <n>y = строк чинності у n років\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4992,38 -3905,30 +4988,38 @@@ msgstr "
  "      <n>m = строк чинності підпису у n місяців\n"
  "      <n>y = строк чинності підпису у n років\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "Яким є строк чинності ключа? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Яким є строк чинності підпису? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "некоректне значення\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "Ключ не має обмеження строку дії\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "Підпис не має обмеження строку дії\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ діє до %s\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Підпис діє до %s\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5031,11 -3936,9 +5027,11 @@@ msgstr "
  "У вашій системі неможливий показ дат після 2038 року.\n"
  "Але програма коректно оброблятиме ці дати до 2106 року.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "Все правильно? (y/N або т/Н) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5050,7 -3953,6 +5046,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5067,49 -3969,38 +5063,49 @@@ msgstr "
  "    \"Ivan Ivanenko (farmer) <iivanenko at moyahata.ua>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "Справжнє ім’я: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "Некоректний символ у імені\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "Ім’я не може починатися з цифри\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "Ім’я має бути не коротшим за 5 літер\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "Адреса ел. пошти: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "Некоректна адреса електронної пошти\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "Коментар: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "Некоректний символ у коментарі\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Вами використано таблицю символів «%s».\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5120,7 -4011,6 +5116,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -5137,32 -4027,25 +5133,32 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "Спочатку виправте помилку\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5174,13 -4057,10 +5170,13 @@@ msgstr "
  "під час створення простого числа. Це надасть змогу генератору\n"
  "псевдовипадкових чисел створити краще випадкове число.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Помилка під час спроби створення ключа: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5191,64 -4071,51 +5187,64 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "Продовжити? (Y (так)/n (ні)) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для «%s» вже існує\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "Створити попри це? (y (так)/N (ні)) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "створюємо попри усе\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
  "створення ключа.\n"
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "Створення ключа скасовано.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "записуємо відкритий ключ до «%s»\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "відкритий і закритий ключі створено і підписано.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5256,7 -4123,6 +5252,7 @@@ msgstr "
  "Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
  "скористатися командою «--edit-key» для створення підключа з цією метою.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5264,7 -4130,6 +5260,7 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
  "проблема з годинником)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5272,19 -4137,15 +5268,19 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
  "або проблема з годинником)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Закриті частини основного ключа недоступні.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Закриті частини основного ключа зберігаються на картці.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "Створити? (y/N або т/Н) "
  
@@@ -5368,12 -4213,10 +5364,12 @@@ msgstr "      Відбиток ключ
  msgid "      Card serial no. ="
  msgstr "Серійний номер картки ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "кешування сховища ключів «%s»\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5381,7 -4224,6 +5377,7 @@@ msgstr[0] "зараз кешовано 
  msgstr[1] "зараз кешовано %lu ключів (%lu підписи)\n"
  msgstr[2] "зараз кешовано %lu ключів (%lu підписів)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5389,7 -4231,6 +5385,7 @@@ msgstr[0] "кешовано %lu клю�
  msgstr[1] "кешовано %lu ключі"
  msgstr[2] "кешовано %lu ключів"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
@@@ -5397,7 -4238,6 +5393,7 @@@ msgstr[0] " (%lu підпис)\n
  msgstr[1] " (%lu підписи)\n"
  msgstr[2] " (%lu підписів)\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: створено сховище ключів\n"
@@@ -5654,13 -4441,10 +5650,12 @@@ msgstr "               за допом�
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
  
 +#: g10/mainproc.c:1777
- #, fuzzy, c-format
- #| msgid "                aka \"%s\""
+ #, c-format
  msgid "               issuer \"%s\"\n"
- msgstr "                або «%s»"
+ msgstr "               видавець «%s»\n"
  
 +#: g10/mainproc.c:1794
  msgid "Key available at: "
  msgstr "Ключ доступний на: "
  
@@@ -5696,7 -4473,6 +5691,7 @@@ msgstr "двійковий
  msgid "textmode"
  msgstr "текстовий"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "невідомо"
  
@@@ -5909,49 -4643,38 +5904,49 @@@ msgstr "
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "підпакет типу %d містить критичний набір бітів\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "проблема з агентом: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "Вкажіть пароль\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "скасовано користувачем\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (ідентифікатор основного ключа %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Вкажіть пароль для розблокування закритого ключа OpenPGP:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "Вкажіть пароль для імпортування закритого ключа OpenPGP:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "Вкажіть пароль для експортування закритого підключа OpenPGP:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Вкажіть пароль для експортування закритого ключа OpenPGP:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Справді хочете остаточно вилучити закритий підключ OpenPGP:"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "Справді хочете остаточно вилучити закритий ключ OpenPGP:"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6141,29 -4831,19 +6136,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 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 ""
- "Не можна з певністю вважати, що ключ належить особі,\n"
- "вказаній у ідентифікаторі користувача. Якщо вам *точно*\n"
- "відомі наслідки ваших дій, можете ствердно відповісти\n"
- "на наступне питання.\n"
+ "Цей ключ є помилковим! Його позначено як не вартий довіри! Якщо\n"
+ "ви попри це впевнені у наслідках своїх дій, вам слід відповісти\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"
@@@ -6386,17 -5019,14 +6374,17 @@@ msgstr "застаріле кодува
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "алгоритм шифрування %d%s є невідомим або вимкненим\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "УВАГА: не виявлено алгоритму шифрування %s у перевагах отримувача\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "ЗАУВАЖЕННЯ: строк дії закритого ключа %s завершився %s\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "ЗАУВАЖЕННЯ: ключ було відкликано"
  
@@@ -6709,7 -5290,6 +6697,7 @@@ msgstr "
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s підпис від: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6717,11 -5297,9 +6705,11 @@@ msgstr "
  "УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
  "відповідає параметрам отримувача\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "підписування:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "Буде використано шифрування %s\n"
@@@ -6782,17 -5349,14 +6770,17 @@@ msgstr "некоректний відб
  msgid "ownertrust value missing"
  msgstr "пропущено значення довіри до власника"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "не вдалося знайти запис довіри у «%s»: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "помилка читання у «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: помилка синхронізації: %s\n"
@@@ -6826,7 -5384,6 +6814,7 @@@ msgstr "занадто велика о�
  msgid "%s: directory does not exist!\n"
  msgstr "%s: каталогу не існує!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "немає доступу до «%s»: %s\n"
@@@ -6957,20 -5488,14 +6945,20 @@@ msgstr "помилка під час с
  msgid "unsupported TOFU database version: %s\n"
  msgstr "непідтримувана версія бази даних TOFU: %s\n"
  
 +#: g10/tofu.c:538
- #, fuzzy, c-format
- #| msgid "error creating temporary file: %s\n"
+ #, c-format
  msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
- msgstr "помилка створення тимчасового файла: %s\n"
+ msgstr ""
+ "помилка під час спроби створити таблицю TOFU «ultimately_trusted_keys»: %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 ""
+ msgstr "помилка бази даних TOFU"
  
- #: 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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
@@@ -6985,74 -5508,54 +6973,65 @@@ msgstr "помилка під час с
  msgid "error initializing TOFU database: %s\n"
  msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
  
 +#: g10/tofu.c:844
- #, fuzzy, c-format
- #| msgid "error reading TOFU database: %s\n"
+ #, c-format
  msgid "error creating 'encryptions' TOFU table: %s\n"
- msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
+ msgstr "помилка під час спроби створити таблицю TOFU «encryptions»: %s\n"
  
 +#: g10/tofu.c:874
  #, c-format
  msgid "adding column effective_policy to bindings DB: %s\n"
- msgstr ""
+ msgstr "додаємо стовпчик 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:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
  
 +#: 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"
+ #, c-format
  msgid ""
  "This is the first time the email address \"%s\" is being used with key %s."
- msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ msgstr "Адреса електронної пошти «%s» вперше використовується з ключем %s."
  
 +#: 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"
+ #, 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 ключем:\n"
- msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
- msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ msgstr[0] "Адресу електронної пошти «%s» пов’язано із %d ключем!"
+ msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами!"
+ msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами!"
  
 +#: g10/tofu.c:1343
- #, 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'."
  msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
- "Ключ із відбитком %s конфліктує із прив’язкою %s. Оскільки правилами цієї "
- "прив’язки визначалося «автоматично», їх змінено на «запитувати»."
+ " Оскільки правилами цієї прив’язки визначалося «автоматично», їх змінено на "
+ "«запитувати»."
  
 +#: 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:1605
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
  
 +#: g10/tofu.c:1615
- #, fuzzy
- #| msgid "list key and user IDs"
  msgid "This key's user IDs:\n"
- msgstr "показати список ключів та ідентифікаторів користувача"
+ msgstr "Ідентифікатори користувачів цього ключа:\n"
  
 +#: g10/tofu.c:1631 g10/tofu.c:1796
  #, c-format
  msgid "policy: %s"
  msgstr "правило: %s"
@@@ -7076,131 -5576,89 +7055,103 @@@ msgstr[2] "Адресу електро�
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
  
 +#: g10/tofu.c:1785 g10/tofu.c:1790
  msgid ", "
- msgstr ""
+ msgstr ", "
  
 +#: g10/tofu.c:1794
  msgid "this key"
  msgstr "цей ключ"
  
 +#: g10/tofu.c:1820
- #, fuzzy, c-format
- #| msgid "Verified %ld messages signed by \"%s\"."
+ #, c-format
  msgid "Verified %d message."
  msgid_plural "Verified %d messages."
- msgstr[0] "Перевірено %ld повідомлень, підписаних «%s»."
- msgstr[1] "Перевірено %ld повідомлень, підписаних «%s»."
- msgstr[2] "Перевірено %ld повідомлень, підписаних «%s»."
+ msgstr[0] "Перевірено %d повідомлення."
+ msgstr[1] "Перевірено %d повідомлення."
+ msgstr[2] "Перевірено %d повідомлень."
  
 +#: g10/tofu.c:1824
- #, fuzzy, c-format
- #| msgid "encrypted with %lu passphrases\n"
+ #, c-format
  msgid "Encrypted %d message."
  msgid_plural "Encrypted %d messages."
- msgstr[0] "зашифровано за допомогою %lu паролів\n"
- msgstr[1] "зашифровано за допомогою %lu паролів\n"
- msgstr[2] "зашифровано за допомогою %lu паролів\n"
+ msgstr[0] "Зашифровано %d повідомлення."
+ msgstr[1] "Зашифровано %d повідомлення."
+ msgstr[2] "Зашифровано %d повідомлень."
  
 +#: g10/tofu.c:1831
- #, fuzzy, c-format
- #| msgid "%ld message signed in the future."
- #| msgid_plural "%ld messages signed in the future."
+ #, c-format
  msgid "Verified %d message in the future."
  msgid_plural "Verified %d messages in the future."
- msgstr[0] "%ld повідомлення підписано у майбутньому."
- msgstr[1] "%ld повідомлення підписано у майбутньому."
- msgstr[2] "%ld повідомлень підписано у майбутньому."
+ msgstr[0] "Перевірено %d повідомлення у майбутньому."
+ msgstr[1] "Перевірено %d повідомлення у майбутньому."
+ msgstr[2] "Перевірено %d повідомлень у майбутньому."
  
 +#: g10/tofu.c:1835
- #, fuzzy, c-format
- #| msgid "%ld message signed in the future."
- #| msgid_plural "%ld messages signed in the future."
+ #, c-format
  msgid "Encrypted %d message in the future."
  msgid_plural "Encrypted %d messages in the future."
- msgstr[0] "%ld повідомлення підписано у майбутньому."
- msgstr[1] "%ld повідомлення підписано у майбутньому."
- msgstr[2] "%ld повідомлень підписано у майбутньому."
+ msgstr[0] "Зашифровано %d повідомлення у майбутньому."
+ msgstr[1] "Зашифровано %d повідомлення у майбутньому."
+ msgstr[2] "Зашифровано %d повідомлень у майбутньому."
  
 +#: g10/tofu.c:1849
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
+ #, c-format
  msgid "Messages verified over the past %d day: %d."
  msgid_plural "Messages verified over the past %d days: %d."
- msgstr[0] " протягом %ld попереднього дня."
- msgstr[1] " протягом %ld попередніх днів."
- msgstr[2] " протягом %ld попередніх днів."
+ msgstr[0] "Перевірено повідомлень протягом останнього %d дня: %d."
+ msgstr[1] "Перевірено повідомлень протягом останніх %d днів: %d."
+ msgstr[2] "Перевірено повідомлень протягом останніх %d днів: %d."
  
 +#: g10/tofu.c:1855
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
+ #, c-format
  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 попередніх днів."
+ msgstr[0] "Повідомлень, які зашифровано протягом останнього %d дня: %d."
+ msgstr[1] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
+ msgstr[2] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
  
 +#: g10/tofu.c:1865
- #, fuzzy, c-format
- #| msgid " over the past %ld month."
- #| msgid_plural " over the past %ld months."
+ #, c-format
  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 попередніх місяців."
+ msgstr[0] "Перевірено повідомлень протягом останнього %d місяця: %d."
+ msgstr[1] "Перевірено повідомлень протягом останніх %d місяців: %d."
+ msgstr[2] "Перевірено повідомлень протягом останніх %d місяців: %d."
  
 +#: g10/tofu.c:1871
- #, fuzzy, c-format
- #| msgid " over the past %ld month."
- #| msgid_plural " over the past %ld months."
+ #, c-format
  msgid "Messages encrypted over the past %d month: %d."
  msgid_plural "Messages encrypted over the past %d months: %d."
- msgstr[0] " протягом %ld попереднього місяця."
- msgstr[1] " протягом %ld попередніх місяців."
- msgstr[2] " протягом %ld попередніх місяців."
+ msgstr[0] "Повідомлень, які зашифровано протягом останнього %d місяця: %d."
+ msgstr[1] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
+ msgstr[2] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
  
 +#: g10/tofu.c:1881
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
+ #, c-format
  msgid "Messages verified over the past %d year: %d."
  msgid_plural "Messages verified over the past %d years: %d."
- msgstr[0] " протягом %ld попереднього дня."
- msgstr[1] " протягом %ld попередніх днів."
- msgstr[2] " протягом %ld попередніх днів."
+ msgstr[0] "Перевірено повідомлень протягом останнього %d року: %d."
+ msgstr[1] "Перевірено повідомлень протягом останніх %d років: %d."
+ msgstr[2] "Перевірено повідомлень протягом останніх %d років: %d."
  
 +#: g10/tofu.c:1887
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
+ #, c-format
  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 попередніх днів."
+ msgstr[0] "Повідомлень, які зашифровано протягом останнього %d року: %d."
+ msgstr[1] "Повідомлень, які зашифровано протягом останніх %d років: %d."
+ msgstr[2] "Повідомлень, які зашифровано протягом останніх %d років: %d."
  
 +#: g10/tofu.c:1895
- #, fuzzy, c-format
- #| msgid " over the past %ld day."
- #| msgid_plural " over the past %ld days."
+ #, c-format
  msgid "Messages verified in the past: %d."
- msgstr " протягом %ld попереднього дня."
+ msgstr "Повідомлень, які перевірено у минулому: %d."
  
 +#: 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."
+ #, c-format
  msgid "Messages encrypted in the past: %d."
- msgstr ""
- "Перевірено %ld повідомлення, підписане «%s»,\n"
- "протягом такого строку: %s."
+ msgstr "Повідомлень, які зашифровано у минулому: %d."
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
@@@ -7228,203 -5683,123 +7179,146 @@@ msgstr "
  "(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
  "(B)Поганий? "
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
- msgstr ""
+ #, fuzzy
+ #| msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
+ msgstr "Типовим значенням є «невідомий»."
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
- msgstr ""
+ msgstr "Виявлено пошкодження бази даних TOFU.\n"
  
 +#: g10/tofu.c:2143
- #, fuzzy, c-format
- #| msgid "error writing key: %s\n"
+ #, c-format
  msgid "resetting keydb: %s\n"
- msgstr "помилка під час спроби запису ключа: %s\n"
+ msgstr "скидаємо базу даних ключів: %s\n"
  
- #: g10/tofu.c:2601
- #, fuzzy, c-format
- #| msgid "error setting TOFU binding's trust level to %s\n"
++#: g10/tofu.c:2605
+ #, c-format
  msgid "error setting TOFU binding's policy to %s\n"
- msgstr ""
- "помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
+ msgstr "помилка під час спроби встановлення правил прив’язки TOFU до %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "помилка під час спроби змінити правила TOFU: %s\n"
  
- #: g10/tofu.c:2839
- #, fuzzy, c-format
- #| msgid "%d~year"
- #| msgid_plural "%d~years"
++#: g10/tofu.c:2852
+ #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
- msgstr[0] "%d~рік"
- msgstr[1] "%d~роки"
- msgstr[2] "%d~років"
+ msgstr[0] "%lld~рік"
+ msgstr[1] "%lld~роки"
+ msgstr[2] "%lld~років"
  
- #: g10/tofu.c:2844
- #, fuzzy, c-format
- #| msgid "%d~month"
- #| msgid_plural "%d~months"
++#: g10/tofu.c:2857
+ #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
- msgstr[0] "%d~місяць"
- msgstr[1] "%d~місяці"
- msgstr[2] "%d~місяців"
+ msgstr[0] "%lld~місяць"
+ msgstr[1] "%lld~місяці"
+ msgstr[2] "%lld~місяців"
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~тиждень"
+ msgstr[1] "%lld~тижні"
+ msgstr[2] "%lld~тижнів"
  
- #: g10/tofu.c:2854
- #, fuzzy, c-format
- #| msgid "%d~day"
- #| msgid_plural "%d~days"
++#: g10/tofu.c:2867
+ #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
- msgstr[0] "%d~день"
- msgstr[1] "%d~дні"
- msgstr[2] "%d~днів"
+ msgstr[0] "%lld~день"
+ msgstr[1] "%lld~дні"
+ msgstr[2] "%lld~днів"
  
- #: g10/tofu.c:2859
- #, fuzzy, c-format
- #| msgid "%d~hour"
- #| msgid_plural "%d~hours"
++#: g10/tofu.c:2872
+ #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
- msgstr[0] "%d~година"
- msgstr[1] "%d~години"
- msgstr[2] "%d~годин"
+ msgstr[0] "%lld~година"
+ msgstr[1] "%lld~години"
+ msgstr[2] "%lld~годин"
  
- #: g10/tofu.c:2864
- #, fuzzy, c-format
- #| msgid "%d~minute"
- #| msgid_plural "%d~minutes"
++#: g10/tofu.c:2877
+ #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
- msgstr[0] "%d~хвилина"
- msgstr[1] "%d~хвилини"
- msgstr[2] "%d~хвилин"
+ msgstr[0] "%lld~хвилина"
+ msgstr[1] "%lld~хвилини"
+ msgstr[2] "%lld~хвилин"
  
- #: g10/tofu.c:2866
- #, fuzzy, c-format
- #| msgid "%d~second"
- #| msgid_plural "%d~seconds"
++#: g10/tofu.c:2879
+ #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
- msgstr[0] "%d~секунда"
- msgstr[1] "%d~секунди"
- msgstr[2] "%d~секунд"
+ msgstr[0] "%lld~секунда"
+ msgstr[1] "%lld~секунди"
+ msgstr[2] "%lld~секунд"
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
- msgstr ""
+ msgstr "%s: перевірено 0~підписів і зашифровано 0~повідомлень."
  
- #: g10/tofu.c:3109
- #, fuzzy, c-format
- #| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:3124
+ #, c-format
  msgid "%s: Verified 0 signatures."
- msgstr "Вилучено %d підписів.\n"
+ msgstr "%s: перевірено 0 підписів."
  
- #: g10/tofu.c:3117
- #, 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."
++#: g10/tofu.c:3132
+ #, c-format
  msgid "%s: Verified %ld~signature in the past %s."
  msgid_plural "%s: Verified %ld~signatures in the past %s."
- msgstr[0] ""
- "Перевірено %ld повідомлення, підписане «%s»,\n"
- "протягом такого строку: %s."
- msgstr[1] ""
- "Перевірено %ld повідомлення, підписаних «%s»,\n"
- "протягом такого строку: %s."
- msgstr[2] ""
- "Перевірено %ld повідомлень, підписаних «%s»,\n"
- "протягом такого строку: %s."
+ msgstr[0] "%s: перевірено %ld~підпис протягом останнього %s."
+ msgstr[1] "%s: перевірено %ld~підписи протягом останнього %s."
+ msgstr[2] "%s: перевірено %ld~підписів протягом останнього %s."
  
- #: g10/tofu.c:3127
- #, fuzzy
- #| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:3142
  msgid "Encrypted 0 messages."
- msgstr "зашифровано за допомогою %lu паролів\n"
+ msgstr "Зашифровано 0 повідомлень."
  
- #: g10/tofu.c:3135
- #, 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."
++#: g10/tofu.c:3150
+ #, c-format
  msgid "Encrypted %ld~message in the past %s."
  msgid_plural "Encrypted %ld~messages in the past %s."
- msgstr[0] ""
- "Перевірено %ld повідомлення, підписане «%s»,\n"
- "протягом такого строку: %s."
- msgstr[1] ""
- "Перевірено %ld повідомлення, підписаних «%s»,\n"
- "протягом такого строку: %s."
- msgstr[2] ""
- "Перевірено %ld повідомлень, підписаних «%s»,\n"
- "протягом такого строку: %s."
+ msgstr[0] "Зашифровано %ld~повідомлення протягом останнього %s."
+ msgstr[1] "Зашифровано %ld~повідомлення протягом останнього %s."
+ msgstr[2] "Зашифровано %ld~повідомлень протягом останнього %s."
  
- #: g10/tofu.c:3146
- #, fuzzy, c-format
- #| msgid "policy: %s"
++#: g10/tofu.c:3161
+ #, c-format
  msgid "(policy: %s)"
- msgstr "правило: %s"
+ msgstr "(правило: %s)"
  
- #: g10/tofu.c:3177
- #, fuzzy
- #| msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
- msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
+ msgstr ""
+ "Попередження: ще не існує повідомлень, які було б підписано цим ключем та "
+ "ідентифікатором користувача!\n"
  
- #: g10/tofu.c:3180
- #, fuzzy
- #| msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
- msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
+ msgstr ""
+ "Попередження: за допомогою цього ключа і ідентифікатора користувача "
+ "підписано лише одне повідомлення!\n"
  
- #: g10/tofu.c:3184
- #, fuzzy
- #| msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
- msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
+ msgstr "Попередження: цим ключем ще не зашифровано жодного повідомлення!\n"
  
- #: g10/tofu.c:3187
- #, fuzzy
- #| msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
- msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
+ msgstr "Попередження: цим ключем було зашифровано лише одне повідомлення!\n"
  
- #: g10/tofu.c:3216
- #, 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"
++#: g10/tofu.c:3231
+ #, 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 "
@@@ -7459,24 -5834,23 +7353,28 @@@ msgstr[2] "
  "  %s\n"
  "для позначення ключа як помилкового.\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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
  
- #: g10/tofu.c:3482
- #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
++#: g10/tofu.c:3498
+ #, fuzzy, c-format
+ #| msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
+ "ПОПЕРЕДЖЕННЯ: шифруємо до %s, для якого не виявлено не відкликаних "
+ "ідентифікаторів користувача.\n"
  
- #: g10/tofu.c:3819
- #, fuzzy, c-format
- #| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3885
+ #, c-format
  msgid "error setting policy for key %s, user id \"%s\": %s"
- msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
+ msgstr ""
+ "помилка під час спроби встановити правила для ключа %s, ідентифікатор "
+ "користувача «%s»: %s"
  
 +#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
@@@ -7520,51 -5886,41 +7418,51 @@@ msgid "If that does not work, please co
  msgstr ""
  "Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
  "довіри %s\n"
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "використовуємо модель довіри %s\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "потреби у перевірці trustdb немає\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "наступну перевірку trustdb призначено на %s\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "потреби у перевірці trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "відкритий ключ %s не знайдено: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "перевірка trustdb\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7572,7 -5928,6 +7470,7 @@@ msgstr[0] "оброблено %d клю
  msgstr[1] "оброблено %d ключі"
  msgstr[2] "оброблено %d ключів"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7580,16 -5935,13 +7478,16 @@@ msgstr[0] " (очищено %d знач
  msgstr[1] " (очищено %d значення чинності)\n"
  msgstr[2] " (очищено %d значень чинності)\n"
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "не знайдено ключів з необмеженою довірою\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7597,7 -5949,6 +7495,7 @@@ msgstr "
  "глибина: %d  чинність: %3d  підписано: %3d  надійність: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -7706,23 -6036,18 +7604,23 @@@ msgstr "
  "Синтаксис: kbxutil [параметри] [файли]\n"
  "Перегляд, експортування, імпортування даних Keybox\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
@@@ -7779,7 -6095,6 +7677,7 @@@ msgstr "
  "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
  "підписів."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "помилка під час отримання нового пінкоду: %s\n"
@@@ -7794,70 -6107,68 +7692,85 @@@ msgstr "не вдалося збере�
  msgid "failed to store the creation date: %s\n"
  msgstr "не вдалося зберегти дату створення: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "помилка отримання стану CHV з картки\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "відповідь не містить основи числення RSA\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "відповідь не містить відкритого показника RSA\n"
  
- #: scd/app-openpgp.c:1355
- #, fuzzy
- #| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1453
  msgid "response does not contain the EC public key\n"
- msgstr "відповідь не містить відкритої точки еліптичної кривої\n"
+ msgstr "відповідь не містить відкритого ключа еліптичної кривої\n"
  
- #: scd/app-openpgp.c:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "відповідь не містить даних відкритого ключа\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "помилка читання відкритого ключа: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "використовуємо типовий пінкод як %s\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
  "використання\n"
  
- #: scd/app-openpgp.c:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Будь ласка, вкажіть пінкод%%0A[підписів: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||Вкажіть пінкод"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
  
- #: scd/app-openpgp.c:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "помилка перевірки CHV%d: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "помилка отримання стану CHV з картки\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "картку заблоковано!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7873,26 -6184,19 +7786,24 @@@ msgstr[2] "
  "картку буде остаточно заблоковано\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:2086
- #, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr ""
- "|A|Будь ласка, вкажіть адміністративний пінкод%%0A[залишилося спроб: %d]"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Вкажіть адміністративний пінкод"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "доступ до адміністративних команд не налаштовано\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||Вкажіть пінкод"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Вкажіть код скидання коду картки"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@@ -7900,78 -6204,60 +7811,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новий код скидання"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|Новий пінкод"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Вкажіть пінкод та новий пінкод"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "помилка читання даних програми\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "помилка читання відбитка DO\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "ключ вже існує\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "вже створений ключ буде замінено\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "створення нового ключа\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "записування нового ключа\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "не вказано часової позначки створення\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  "Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "не вдалося зберегти ключ: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  msgid "unsupported curve\n"
  msgstr "непідтримувана крива\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "зачекайте на завершення створення ключа...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "помилка під час створення ключа\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7979,30 -6265,24 +7890,30 @@@ msgstr[0] "створення ключ�
  msgstr[1] "створення ключа завершено (за %d секунди)\n"
  msgstr[2] "створення ключа завершено (за %d секунд)\n"
  
- #: scd/app-openpgp.c:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "відбиток на картці не відповідає запитаному\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "вже створено підписів: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@@ -8022,51 -6299,39 +7933,51 @@@ msgstr "|N|Початковий нов�
  msgid "run in multi server mode (foreground)"
  msgstr "запустити у режимі декількох серверів (основному режимі)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|встановити вказаний рівень діагностики"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|FILE|записувати журнал до файла"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|з’єднатися зі зчитувачем на вказаному порту"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|NAME|використовувати вказаний драйвер ct-API"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NAME|використовувати вказаний драйвер PC/SC"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "не використовувати вбудованого драйвера CCID"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|від’єднати бездіяльну вказану кількість секунд картку"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "не використовувати додаткову клавіатуру зчитувача"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "заборонити використання команд з адміністрування картки"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "використовувати змінну довжину вхідних даних для зчитувача"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "Використання: @SCDAEMON@ [параметри] (-h — довідка)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -8080,22 -6344,14 +7991,17 @@@ msgstr "
  "будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
  "фоновому режимі\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "запущено запуск обробки для дескриптора %d\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "роботу обробника для дескриптора %d перервано\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "пропущено некоректний символ radix64 %02x\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
  msgstr "у цьому сеансі не запущено dirmngr\n"
  
@@@ -8112,12 -6365,10 +8018,12 @@@ msgstr "ланцюжок
  msgid "shell"
  msgstr "оболонка"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "не підтримується критичне розширення сертифікації %s"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "сертифікат видавця не позначено як сертифікат служби сертифікації (CA)"
  
@@@ -8130,11 -6379,9 +8036,11 @@@ msgstr "правила, позначе�
  msgid "failed to open '%s': %s\n"
  msgstr "не вдалося відкрити «%s»: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "Зауваження: заборонено некритичні правила сертифікації"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "заборонено правила сертифікації"
  
@@@ -8161,9 -6403,6 +8067,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -8184,12 -6419,10 +8090,12 @@@ msgstr "будь ласка, перек
  msgid "checking the CRL failed: %s"
  msgstr "помилка під час перевірки CRL: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "сертифікат з некоректною чинністю: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "сертифікат ще не набув чинності"
  
@@@ -8201,7 -6432,6 +8107,7 @@@ msgstr "кореневий сертиф
  msgid "intermediate certificate not yet valid"
  msgstr "проміжний сертифікат ще не набув чинності"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "строк дії сертифіката завершився"
  
@@@ -8250,7 -6469,6 +8156,7 @@@ msgstr "  (   сертифікат чи
  msgid "  (     issuer valid from "
  msgstr "  (     видавець чинний з "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "відбиток=%s\n"
@@@ -8279,7 -6491,6 +8185,7 @@@ msgstr "у сертифікаті не 
  msgid "self-signed certificate has a BAD signature"
  msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "кореневий сертифікат не позначено як надійний"
  
@@@ -8288,30 -6498,24 +8194,30 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "помилка перевірки списку довіри: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "занадто довгий ланцюжок сертифікації\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "не знайдено видавця сертифіката"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "сертифікат має ПОМИЛКОВИЙ підпис"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "виявлено інший можливий відповідний сертифікат служби сертифікації (CA) — "
  "повторюємо спробу"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "ланцюжок сертифікації є довшим за дозволений CA (%d)"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "сертифікат є належним\n"
  
@@@ -8337,11 -6536,9 +8243,11 @@@ msgstr "використана моде
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%u-бітовий хеш не є коректним для %u-бітового ключа %s\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(це алгоритм MD2)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "немає"
  
@@@ -8376,36 -6568,28 +8282,36 @@@ msgstr "
  "С/Н %s, ідентифікатор 0x%08lX,\n"
  "створено %s, застаріває %s.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "не вказано використання ключа — припускаємо всі можливі використання\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "сертифікат не мав використовуватися для сертифікації\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "сертифікат не мав використовуватися для шифрування\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "сертифікат не мав використовуватися для підписування\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "сертифікат непридатний для шифрування\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "сертифікат непридатний для підписування\n"
  
@@@ -8503,7 -6669,6 +8409,7 @@@ msgstr "
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "рядок %d: помилка створення ключа: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8511,64 -6676,51 +8417,64 @@@ msgstr "
  "Щоб завершити цей запит щодо сертифікації, будь ласка, ще раз вкажіть пароль "
  "для ключа, який ви щойно створили.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) Вже записаний ключ\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) Вже записаний ключ з картки\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "помилка читання картки: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Серійний номер картки: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "Доступні ключі:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "Можливі дії для ключа %s:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) підписування, шифрування\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) підписування\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) шифрування\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "Вкажіть назву призначення X.509: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "Не вказано назви призначення\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "Некоректна мітка назви призначення «%.*s»\n"
@@@ -8578,74 -6730,57 +8484,74 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "Некор. назва призн. «%s»\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  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
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "Вкажіть адреси ел.пошти"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (завершіть порожнім рядком):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "Вкажіть назви DNS"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (необов’язковий; завершується порожнім рядком):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "Вкажіть адреси"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "Створити самопідписаний сертифікат? (y/N або т/Н) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "Використано ці параметри:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "Створюємо самопідписаний сертифікат.  "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "Створюємо запит щодо сертифікації.  "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "Зачекайте...\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "Виконано.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  "Готово. Тепер вам слід надіслати цей запит до вашої служби сертифікації "
  "(CA).\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "проблема з ресурсами: вихід за межі пам’яті\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(це алгоритм RC2)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(здається, це не зашифроване повідомлення)\n"
  
@@@ -8779,7 -6883,6 +8685,7 @@@ msgid "|USER-ID|use USER-ID as default 
  msgstr ""
  "|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "використовувати цей сервер ключів для пошуку"
  
@@@ -8864,17 -6951,14 +8770,17 @@@ msgstr "помилка під час с
  msgid "basic certificate checks failed - not imported\n"
  msgstr "помилка під час основних перевірок сертифіката — не імпортовано\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "помилка під час спроби імпортування сертифіката: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "помилка під час спроби читання вхідних даних: %s\n"
@@@ -8943,7 -7016,6 +8849,7 @@@ msgstr "
  "\n"
  "%s%sВи справді хочете це зробити?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8962,162 -7033,133 +8868,168 @@@ msgstr "
  "«%s»\n"
  "Зауважте, що цей сертифікат НЕ створюватиме якісного підпису!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
  "підтримки алгоритму хешування %d (%s) для підписувальника %d не передбачено; "
  "використовуємо %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "алгоритм хешування, використаний для підписувача %d: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "помилка перевірки якості сертифікатів: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "Підпис створено "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[дату не вказано]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " використовуємо ідентифікатор сертифіката 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  "некоректний підпис: атрибут контрольної суми повідомлення не збігається з "
  "обчисленою сумою\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "Правильний підпис від"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                або"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "Це якісний підпис\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "не вдалося ініціалізувати блокування кешу сертифікатів: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "не вдалося заблокувати для читання кеш сертифікатів: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "не вдалося заблокувати для запису кеш сертифікатів: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "не вдалося зняти блокування з кешу сертифікатів: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "викидання %u сертифікатів з кешу\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "не вдалося обробити сертифікат «%s»: %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "сертифікат «%s» вже кешовано\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "надійний сертифікат «%s» завантажено\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "сертифікат «%s» завантажено\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  відбиток SHA1 = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "   видавець ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "  призначення ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "помилка під час спроби завантаження сертифіката «%s»: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "остаточно завантажені сертифікати: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "    динамічно кешовані сертифікати: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "    динамічно кешовані сертифікати: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "сертифікат вже кешовано\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "сертифікат кешовано\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "помилка під час спроби кешування сертифіката: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "некоректний рядок відбитка SHA1 «%s»\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "помилка під час спроби отримання сертифіката за серійним номером: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "помилка під час спроби отримання сертифіката за призначенням: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "у сертифікаті не виявлено запису видавця\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "помилка під час спроби отримання authorityKeyIdentifier: %s\n"
@@@ -9152,7 -7188,6 +9064,7 @@@ msgstr "вилучаємо файл к�
  msgid "not removing file '%s'\n"
  msgstr "не вилучаємо файл «%s»\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "помилка під час спроби закриття файла кешу: %s\n"
@@@ -9379,7 -7370,6 +9291,7 @@@ msgstr "серійний номер %s 
  msgid "error getting data from cache file: %s\n"
  msgstr "помилка під час спроби отримання даних з файла кешу: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "невідомий алгоритм хешування «%s»\n"
@@@ -9393,12 -7381,10 +9305,12 @@@ msgstr "помилка використ
  msgid "got an invalid S-expression from libksba\n"
  msgstr "отримано некоректний вираз S з libksba\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "спроба перетворення виразу S зазнала невдачі: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "спроба створення виразу S зазнала невдачі: %s\n"
@@@ -9447,88 -7424,72 +9359,88 @@@ msgstr "пошук видавця CRL �
  msgid "CRL signature verification failed: %s\n"
  msgstr "помилка перевірки підпису CRL: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr ""
  "помилка під час спроби перевірки чинності сертифіката видавця CRL: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "помилка ksba_crl_new: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "помилка ksba_crl_set_reader: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "вилучено застарілий тимчасовий файл кешу «%s»\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr ""
  "помилка під час спроби вилучення застарілого тимчасового файла кешу «%s»: "
  "%s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "помилка під час спроби створення тимчасового файла кешу «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "помилка crl_parse_insert: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr ""
  "помилка під час спроби завершення запису тимчасового файла кешу «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "помилка під час спроби закриття тимчасового файла кешу «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  "УВАГА: новий CRL все ще занадто старий; його строк дії завершується %s — "
  "попри це завантажуємо\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "новий CRL все ще занадто старий; його строк дії завершується %s\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "невідомий критичний додаток CRL %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "помилка під час читання додатків CRL: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "створюємо файл кешу «%s»\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "проблема під час перейменування «%s» на «%s»: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9536,12 -7497,10 +9448,12 @@@ msgstr "
  "помилка під час спроби оновлення файла каталогу — запис кешу буде втрачено "
  "під час наступного запуску програми\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
@@@ -9549,53 -7508,42 +9461,53 @@@ msgstr "
  " ПОМИЛКА: CRL не буде використано, оскільки він все ще застарілий після "
  "оновлення!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr " ПОМИЛКА: CRL не буде використано через невідомий критичний додаток!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " ПОМИЛКА: CRL не буде використано\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr " ПОМИЛКА: цей кешований CRL можливо було підроблено!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " УВАГА: некоректна довжина запису кешу\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "проблема під час читання запису кешу: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "проблема під час спроби читання ключа кешу: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "помилка під час спроби читання запису кешу з бази даних: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "Кінець дампу CRL\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "помилка crl_fetch за DP: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "помилка crl_cache_insert за DP: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@@ -9604,47 -7551,35 +9516,47 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "засіб читання до таблиці відповідності файлів переповнено — очікуємо\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "використовуємо «http» замість «https»\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "помилка під час спроби ініціалізації об’єкта читання: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "Адресу «%s» переспрямовано до «%s» (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "занадто багато переспрямувань\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "помилка отримання «%s»: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "помилка отримання «%s»: стан http %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "Доступ до CRL неможливий через увімкнений режим Tor\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "пошук сертифікатів неможливий через вимкнений %s\n"
@@@ -9786,112 -7692,84 +9698,112 @@@ msgstr "мало бути вказан�
  msgid "looking up '%s'\n"
  msgstr "пошук «%s»\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "показати вміст кешу CRL"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|отримати CRL з вказаної адреси"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "завершити роботу dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "спорожнити кеш"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|записувати журнал режиму сервера до файла"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "запустити без запиту до користувача"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "примусове завантаження застарілих САС"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "дозволити надсилання запитів OCSP"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
- msgstr ""
+ msgstr "дозволити інтерактивну перевірку версії програмного забезпечення"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "заборонити використання HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "заборонити використання LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу HTTP"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу LDAP"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ігнорувати адреси служб OCSP з сертифікатами"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не використовувати резервні вузли з --ldap-proxy"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|встановити вказаний час очікування даних від LDAP"
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|відповідь OCSP підписано FPR"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|повертати не більше за вказану кількість записів на запит"
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9901,11 -7779,9 +9813,11 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man) «info»)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9913,78 -7789,61 +9825,78 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
  "Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "коректними рівнями зневаджування є: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "використання: %s [параметри]"
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "не можна використовувати двокрапки у назві сокета\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "помилка під час обробки CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: виявлено некоректний відбиток\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: помилка під час читання: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  "отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "примусове завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -10216,35 -8027,28 +10128,35 @@@ msgstr "некоректний симв
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "додавання «%s:%d» до списку сервера LDAP\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "помилка malloc: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search перевищив обмеження розміру сервера\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "виявлено некоректний канонічний вираз S\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "помилка gcry_md_open: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "ой: помилка ksba_cert_hash: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "виявлено помилкове кодування адреси\n"
  
@@@ -10276,244 -8074,188 +10188,240 @@@ msgstr "помилка під час в
  msgid "error building OCSP request: %s\n"
  msgstr "помилка під час спроби побудови запиту за OCSP: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "помилка під час спроби встановлення з’єднання з «%s»: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "помилка під час спроби читання відповіді за HTTP для «%s»: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "помилка під час обробки відповіді за OCSP для «%s»: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "Відповідач OCSP перебуває у стані «%s»: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "спроба хешування відповіді OCSP для «%s» зазнала невдачі: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "не підписано типовим сертифікатом підписувальника OCSP"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "для відповідей за OCSP передбачено підтримку лише SHA-1\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "спроба розміщення пункту списку у пам’яті зазнала невдачі: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "помилка під час спроби отримання ідентифікатора відповідача: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "не виявлено придатного сертифіката для перевірки відповіді за OCSP\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "не виявлено сертифіката видавця: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "викликаною підпрограмою не повернуто сертифіката призначення\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "викликаною підпрограмою не повернуто сертифіката видавця\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "не вдалося розмістити контекст OCSP: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "не вдалося отримати authorityInfoAccess: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "не визначено типового відповідача за OCSP\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "не визначено типового підписувача за OCSP\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "використовуємо типовий відповідач за OCSP «%s»\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "використовуємо відповідач за OCSP «%s»\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "не вдалося встановити контекст хешування для OCSP: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "помилка під час отримання стану OCSP для сертифіката призначення: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "стан сертифіката: %s  (цей=%s  наступний=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "придатний"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "сертифікат було відкликано: %s причина: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "Відповідачем OCSP повернуто стан у майбутньому\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "Відповідачем OCSP повернуто не поточний стан\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "помилка assuan_inquire(%s): %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "не вказано ldapserver"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "у ідентифікаторі сертифіката немає серійного номера"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "помилка assuan_inquire: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "помилка fetch_cert_by_url: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "помилка під час спроби надсилання даних: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "помилка start_cert_fetch: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "помилка fetch_next_cert: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "перевищено max_replies у %d\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "не вдалося розмістити структуру керування: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "не вдалося розмістити контекст assuan: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "не вдалося ініціалізувати сервер: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема з прийняттям Assuan: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "помилка обробки за допомогою Assuan: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr "приймаємо кореневий сертифікат CA не позначений як CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "занадто високий рівень вкладеності перевірки CRL\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "не перевіряємо CRL щодо"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "перевіряємо CRL щодо"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr ""
  "спроба перевірки надійності кореневого сертифіката зазнала невдачі: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "коректний ланцюжок сертифікації\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA потребує використання 160-бітового алгоритму хешування\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "сертифікат не мав використовуватися для підписування CRL\n"
  
@@@ -10610,200 -8331,142 +10518,190 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "Параметри керування налаштуваннями"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "Параметри діагностики"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "Параметри керування захистом"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|завершувати строк дії ключів SSH за N секунд"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|встановити максимальний строк дії кешу пінкодів у секундах"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|встановити максимальний строк дії ключа SSH у секундах"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "Параметри примусового використання правил паролів"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "не дозволяти обхід правил паролів"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|встановити вказану мінімальну довжину нових паролів"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|вимагати у нових паролях не менше вказаної кількості нелітер"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|FILE|перевіряти нові паролі за зразком з вказаного файла"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|завершувати строк дії паролів за вказану кількість днів"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "не дозволяти повторне використання старих паролів"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NAME|використовувати вказаний типовий закритий ключ"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NAME|шифрувати також до вказаного ідентифікатора користувача"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|встановити замінники адреси електронної пошти"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "Налаштування для серверів ключів"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|використовувати сервер ключів за адресою"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "дозволити пошук PKA (запити до DNS)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  "|MECHANISMS|використовувати вказаний механізм для пошуку ключів за адресою"
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "заборонити доступ до dirmngr"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "використовувати вказане кодування для паролів PKCS#12"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "не шукати у списках відкликаних сертифікатів кореневі сертифікати"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "Параметри керування форматом виведення"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметри керування інтерактивністю та примусом"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr "Параметри керування використанням Tor"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "Налаштування для серверів HTTP"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "використовувати загальносистемний проксі-сервер HTTP"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "Налаштування використання серверів LDAP"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "список серверів LDAP"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "Налаштування OCSP"
  
- #: tools/gpgconf-comp.c:1081
- #, fuzzy
- #| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
- msgstr "GPG для OpenPGP"
+ msgstr "OpenPGP"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
- msgstr ""
+ msgstr "Закриті ключі"
  
- #: tools/gpgconf-comp.c:1083
- #, fuzzy
- #| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
- msgstr "Фонова служба карток пам’яті"
+ msgstr "Картки пам’яті"
  
- #: tools/gpgconf-comp.c:1084
- #, fuzzy
- #| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
- msgstr "GPG для S/MIME"
+ msgstr "S/MIME"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
- msgstr ""
+ msgstr "Мережа"
  
- #: tools/gpgconf-comp.c:1086
- #, fuzzy
- #| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1093
  msgid "Passphrase Entry"
- msgstr "Введення пінкодів і паролів"
+ msgstr "Введення пароля"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "Компонент не є придатним до запуску"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Помилка зовнішньої перевірки компонента %s"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "Зауважте, що специфікації груп буде проігноровано\n"
  
- #: tools/gpgconf-comp.c:4094
- #, fuzzy, c-format
- #| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4125
+ #, c-format
  msgid "error closing '%s'\n"
- msgstr "помилка під час спроби закрити «%s»: %s\n"
+ msgstr "помилка під час спроби закрити «%s»\n"
  
- #: tools/gpgconf-comp.c:4096
- #, fuzzy, c-format
- #| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4127
+ #, c-format
  msgid "error parsing '%s'\n"
- msgstr "помилка під час спроби хешування «%s»: %s\n"
+ msgstr "помилка під час спроби обробити «%s»'\n"
  
 +#: tools/gpgconf.c:73
  msgid "list all components"
  msgstr "показати список всіх компонентів"
  
@@@ -10827,13 -8485,9 +10725,11 @@@ msgstr "|COMPONENT|перевірит�
  msgid "apply global default values"
  msgstr "застосувати загальні типові значення"
  
 +#: tools/gpgconf.c:81
- #, fuzzy
- #| msgid "|FILE|take policy information from FILE"
  msgid "|FILE|update configuration files using FILE"
- msgstr "|FILE|взяти дані щодо правил з вказаного файла"
+ msgstr "|FILE|оновити файли налаштувань на основі файла ФАЙЛ"
  
 +#: tools/gpgconf.c:83
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
  
@@@ -10845,13 -8497,9 +10741,11 @@@ msgstr "показати загальн
  msgid "check global configuration file"
  msgstr "перевірити загальний файл налаштувань"
  
 +#: tools/gpgconf.c:89
- #, fuzzy
- #| msgid "update the trust database"
  msgid "query the software version database"
- msgstr "оновити базу даних довіри"
+ msgstr "надіслати запит до бази даних версій програмного забезпечення"
  
 +#: tools/gpgconf.c:90
  msgid "reload all or a given component"
  msgstr "перезавантажити всі або вказаний компонент"
  
diff --cc po/zh_CN.po
index d6c36a3,cbfbe24..2c9960a
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -20,7 -19,6 +20,7 @@@
  "X-Poedit-SourceCharset: iso-8859-1\n"
  "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "无法存储指纹:%s\n"
@@@ -31,41 -29,32 +31,41 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -73,7 -62,6 +73,7 @@@ msgstr "无效的密码
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  #, fuzzy
  msgid "Quality:"
  msgstr "有效性:%s"
@@@ -84,75 -72,59 +84,75 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "错误的密码"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  #, fuzzy
  msgid "PIN too long"
  msgstr "列太长"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "列太长"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "姓名含有无效的字符\n"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad PIN"
  msgstr "损坏的多精度整数(MPI)"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "错误的密码"
@@@ -162,156 -133,121 +162,163 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "无法打开‘%s’: %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "找不到可写的私钥钥匙环:%s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ msgid "error getting list of cards: %s\n"
+ msgstr "获取新 PIN 时出错:%s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "更改密码"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  #, fuzzy
  msgid "Please insert the card with serial number"
  msgstr ""
  "请取出当前的卡,并插入有下列序列号的卡:\n"
  "  %.*s\n"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  "请取出当前的卡,并插入有下列序列号的卡:\n"
  "  %.*s\n"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  #, fuzzy
  msgid "Admin PIN"
  msgstr "|A|管理员 PIN"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr ""
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr ""
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  #, fuzzy
  msgid "Repeat this Reset Code"
  msgstr "再次输入此 PIN:"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  #, fuzzy
  msgid "Repeat this PUK"
  msgstr "再次输入此 PIN:"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  #, fuzzy
  msgid "Repeat this PIN"
  msgstr "再次输入此 PIN:"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
  msgstr "PIN 再次输入时与首次输入不符;请再试一次"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
  msgstr "PIN 再次输入时与首次输入不符;请再试一次"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "PIN 再次输入时与首次输入不符;请再试一次"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, fuzzy, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
@@@ -396,48 -318,33 +403,48 @@@ msgstr "
  "选项:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "Key is superseded"
  msgid "run in supervised mode"
  msgstr "密钥被替换"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "尽量减少提示信息"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr ""
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 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:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr ""
  
@@@ -521,11 -411,6 +528,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: tools/gpgconf.c:124 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "请向 <@EMAIL@> 报告程序缺陷。\n"
@@@ -542,47 -425,34 +549,47 @@@ msgid "
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, 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:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 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:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "从‘%s’读取选项\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, 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:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
@@@ -592,28 -461,22 +599,28 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: agent/gpg-agent.c:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在将私钥写至`%s'\n"
@@@ -642,7 -499,6 +649,7 @@@ msgstr "fstat(%d) 在 %s 中出错:%s
  msgid "can't use '%s' as home directory\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -667,12 -519,10 +674,12 @@@ msgstr "
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "更新私钥失败:%s\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s:已跳过:%s\n"
@@@ -694,8 -540,6 +701,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -703,9 -547,6 +710,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -759,8 -592,6 +766,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
@@@ -819,8 -641,6 +826,8 @@@ msgstr "
  msgid "Yes"
  msgstr "yes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -871,7 -684,6 +878,7 @@@ msgstr "更改密码
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -879,13 -691,11 +886,13 @@@
  "%%0A?"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "启用密钥"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -905,7 -712,6 +912,7 @@@ msgstr "DSA 密钥 %s 使用不安全�
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
@@@ -932,22 -734,14 +939,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -962,8 -754,6 +969,8 @@@ msgstr "
  msgid "error running '%s': probably not installed\n"
  msgstr "读取‘%s’时出错:%s\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -973,12 -762,10 +980,12 @@@
  msgid "error running '%s': terminated\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
@@@ -1205,8 -946,6 +1212,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:3102
++#: scd/app-openpgp.c:3257
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1343,7 -1055,10 +1350,12 @@@ msgstr "结尾行有问题\n
  msgid "[none]"
  msgstr "[未设定]"
  
++#: common/ksba-io-support.c:338
+ #, fuzzy, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "跳过无效的 64 进制字符 %02x\n"
+ 
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "不允许使用管理员命令\n"
@@@ -1419,7 -1120,6 +1431,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  #, fuzzy
  msgid "out of core\n"
  msgstr "可选"
@@@ -1478,8 -1167,6 +1490,8 @@@ msgstr "找不到公钥 %s:%s\n
  msgid "waiting for lock %s...\n"
  msgstr "等待‘%s’上的锁\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1634,8 -1288,6 +1646,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "在批处理模式中无法完成此操作\n"
  
@@@ -1644,15 -1295,10 +1656,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  #, 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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "您的选择? "
  
@@@ -1714,17 -1346,11 +1726,17 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
@@@ -1784,7 -1397,6 +1796,7 @@@ msgstr "针对密钥的操作无法实�
  msgid "not an OpenPGP card"
  msgstr "不是一个 OpenPGP 卡"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
@@@ -1815,13 -1422,10 +1827,13 @@@ msgstr "您想要用多大的密钥尺�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
@@@ -1880,9 -1474,6 +1892,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "无效的选择。\n"
  
@@@ -2008,23 -1570,15 +2020,23 @@@ msgstr "无效的指令(尝试“help�
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在这个命令中不起作用\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1628,6 +2098,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
@@@ -2124,7 -1659,6 +2136,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2244,39 -1754,30 +2256,39 @@@ msgstr "导出时尽可能清除密钥�
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s:已跳过:%s\n"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "正在写入‘%s’\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "密钥 %s:密钥在卡上——已跳过\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "不允许导出私钥\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "密钥 %s:PGP 2.x 样式的密钥――已跳过\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "警告:没有导出任何东西\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2556,7 -1996,6 +2568,7 @@@ msgstr "|N|设定压缩等级为 N (0 �
  msgid "use canonical text mode"
  msgstr "使用标准的文本模式"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "从‘%s’读取选项\n"
@@@ -2754,465 -2165,367 +2766,469 @@@ msgstr "警告:扩展模块‘%s’�
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的配置项‘%s’\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "列出密钥时显示用户标识"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "列出签名时显示策略 URL"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "列出签名时显示用户提供的注记"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出密钥时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出密钥时显示已吊销或已过期的用户标识"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "列出密钥时显示钥匙环的名称"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "列出签名时显示过期日期"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  msgid "valid values for option '%s':\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  msgid "invalid value for option '%s'\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, 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:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, 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:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, 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:3045
++#: g10/gpg.c:3047
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/gpg.c:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, 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:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d:无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d:无效的导入选项\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "无效的导入选项\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d:无效的导出选项\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "无效的导出选项\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d:无效的列表选项\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "验证签名时显示照片标识"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "验证签名时显示策略 URL"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "验证签名时显示所有注记"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "验证签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "验证签名时显示用户提供的注记"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "验证签名时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "验证签名时显示用户标识的有效性"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "使用 PKA 数据验证签名的有效性"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提升带有有效 PKA 数据的签名的信任度"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d:无效的校验选项\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "无效的校验选项\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "无法把运行路径设成 %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d:无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告:程序可能会创建核心内存转储!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告:%s 会使得 %s 失效\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不可与 %s 并用\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 与 %s 并用无意义!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所选的对称加密算法无效\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "所选的散列算法无效\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "所选的压缩算法无效\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所选的证书散列算法无效\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "需要的完全可信签名数一定要大于 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "需要的勉强可信签名数一定要大于 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "最大验证深度一定要介于 1 和 255 之间\n"
  
- #: g10/gpg.c:3735
++#: g10/gpg.c:3739
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
  
- #: g10/gpg.c:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  #, 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:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "无效的默认首选项\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "无效的个人对称加密算法首选项\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "无效的个人散列算法首选项\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "无效的个人压缩算法首选项\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 尚不能和 %s 并用\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, 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:3851
++#: g10/gpg.c:3855
  #, 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:3856
++#: g10/gpg.c:3860
  #, 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:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "初始化信任度数据库失败:%s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, 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:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "上传至公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "从公钥服务器接收失败:%s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "搜寻公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "从公钥服务器更新失败:%s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解开 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "进行 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 g10/tofu.c:2151
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: g10/gpg.c:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "请开始键入您的报文……\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "给定的的验证策略 URL 无效\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "给定的签名策略 URL 无效\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "给定的首选公钥服务器 URL 无效\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "从这个钥匙环里取用密钥"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "把时间戳矛盾仅视为警告"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|FD|把状态信息写入文件描述符 FD"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "用法:gpgv [选项] [文件] (用 -h 求助)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -4511,14 -3559,9 +4527,14 @@@ msgid "
  "unless you restart the program.\n"
  msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "已吊销"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "已过期"
  
@@@ -4556,7 -3593,6 +4572,7 @@@ msgstr "您确定仍然想要增加吗�
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
@@@ -4588,7 -3618,6 +4604,7 @@@ msgstr[1] "已经删除了 %d 个签名
  msgid "Nothing deleted.\n"
  msgstr "没有东西被删除。\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "无效"
  
@@@ -4826,71 -3807,55 +4842,71 @@@ msgstr "子钥 %s 已被吊销。\n
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
  
- #: g10/keygen.c:316
++#: g10/keygen.c:317
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "首选项‘%s’重复\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "太多对称加密算法首选项\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "太多散列算法首选项\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "太多首选压缩算法\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, 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:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "正在写入直接签名\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "正在写入自身签名\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "正在写入密钥绑定签名\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "密钥尺寸无效:改用 %u 位\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "密钥尺寸舍入到 %u 位\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "签名"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "验证"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "认证"
  
@@@ -4904,158 -3869,127 +4920,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 密钥可能的操作:"
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "目前允许的操作:"
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 选择是否用于签名\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 选择是否用于加密\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 选择是否用于认证\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (仅用于签名)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (仅用于加密)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (自定义用途)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (自定义用途)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, 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:1936
++#: g10/keygen.c:1921
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (2) 加密密钥\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "输入注记:"
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "您所要求的密钥尺寸是 %u 位\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  #, 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:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5071,7 -4005,6 +5087,7 @@@ msgstr "
  "      <n>m = 密钥在 n 月后过期\n"
  "      <n>y = 密钥在 n 年后过期\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5087,38 -4020,30 +5103,38 @@@ msgstr "
  "      <n>m = 签名在 n 月后过期\n"
  "      <n>y = 签名在 n 年后过期\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "密钥的有效期限是?(0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "签名的有效期限是多久?(%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "无效的数值\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "密钥永远不会过期\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "签名永远不会过期\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "密钥于 %s 过期\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "签名于 %s 过期\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5126,11 -4051,9 +5142,11 @@@ msgstr "
  "您的系统无法显示 2038 年以后的日期。\n"
  "不过,它可以正确处理 2106 年之前的年份。\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "以上正确吗?(y/n)"
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5141,7 -4064,6 +5157,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5157,50 -4079,39 +5173,50 @@@ msgstr "
  "    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "真实姓名:"
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "姓名含有无效的字符\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用数字开头\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五个字符长\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "电子邮件地址:"
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "注释:"
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "注释含有无效的字符\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, 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:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5211,7 -4122,6 +5227,7 @@@ msgstr "
  "    “%s”\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
  
@@@ -5226,35 -4136,28 +5242,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  #, 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:2755
++#: g10/keygen.c:2740
  #, 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:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "请先改正错误\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5264,13 -4167,10 +5280,13 @@@ msgstr "
  "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
  "鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "生成密钥失败:%s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5278,71 -4178,58 +5294,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "密钥已存在\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "无论如何还是使用这把密钥吗?(y/N)"
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "生成新密钥\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "密钥生成已取消。\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, 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:4440
++#: g10/keygen.c:4455
  #, 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:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "正在将公钥写至`%s'\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可写的公钥钥匙环:%s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, 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:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "公钥和私钥已经生成并经签名。\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5350,33 -4237,27 +5366,33 @@@ msgstr "
  "请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
  "生成用于加密的子钥。\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  #, 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:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主钥的私钥部分无法取用。\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主钥的私钥部分存储在卡上。\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "真的要建立吗?(y/N)"
  
@@@ -5458,13 -4323,11 +5474,13 @@@ msgstr "密钥指纹 =
  msgid "      Card serial no. ="
  msgstr "卡序列号 ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
  msgstr "缓存钥匙环‘%s’\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5472,14 -4335,12 +5488,14 @@@ msgid_plural "%lu keys cached so far (%
  msgstr[0] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
  msgstr[1] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5487,7 -4348,6 +5503,7 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 个损坏的签名\n"
  msgstr[1] "1 个损坏的签名\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s:钥匙环已建立\n"
@@@ -5785,7 -4583,6 +5801,7 @@@ msgstr "二进制
  msgid "textmode"
  msgstr "文本模式"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "未知"
  
@@@ -6005,57 -4760,46 +6021,57 @@@ msgstr "警告:潜在不安全的对�
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "%d 类别的子包设定了关键位\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "代理程序有问题――正在停用代理程序\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "请输入密码\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "用户取消\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (主钥匙号 %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6476,18 -5137,15 +6492,18 @@@ msgstr "不支持旧式的 DEK 编码\n
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "对称加密算法 %d%s 未知或已停用\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "注意:收件人的首选项中找不到加密算法 %s\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
  msgstr "注意:私钥 %s 已于 %s 过期\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
@@@ -6772,17 -5381,14 +6788,17 @@@ msgstr "警告:无法 %%-扩展首选
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s 签名来自:“%s”\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "正在签名:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s 加密将被采用\n"
@@@ -6840,19 -5435,16 +6856,19 @@@ msgstr "指纹无效
  msgid "ownertrust value missing"
  msgstr "没有信任度"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
  msgstr "读取‘%s’错误:%s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任度数据库:同步失败:%s\n"
@@@ -6888,7 -5474,6 +6904,7 @@@ msgstr "信任度数据库处理量过�
  msgid "%s: directory does not exist!\n"
  msgstr "%s:目录不存在!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7032,10 -5589,6 +7048,10 @@@ msgstr "生成密码的时候发生错�
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -7067,7 -5615,6 +7083,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -7240,11 -5760,9 +7256,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7253,121 -5770,101 +7269,121 @@@
  msgid "resetting keydb: %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "已经删除了 %d 个签名。\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  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:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "以 %lu 个密码加密\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  msgid "Encrypted %ld~message in the past %s."
  msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "有效性:%s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7384,18 -5881,14 +7400,18 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7445,51 -5929,41 +7461,51 @@@ msgstr "
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "使用 %s 信任模型\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "不需要检查信任度数据库\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任度数据库检查将于 %s 进行\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, 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:549
++#: g10/trustdb.c:564
  #, 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:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公钥 %s:%s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "请执行一次 --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "正在检查信任度数据库\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7497,7 -5971,6 +7513,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "目前已处理 %lu 把密钥\n"
  msgstr[1] "目前已处理 %lu 把密钥\n"
  
- #: g10/trustdb.c:1913
++#: g10/trustdb.c:1944
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7505,23 -5978,19 +7521,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  msgstr[1] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  
- #: g10/trustdb.c:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "没有找到任何绝对信任的密钥\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@@ -7634,19 -6082,14 +7650,19 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN 回调返回错误:%s\n"
@@@ -7695,7 -6129,6 +7711,7 @@@ msgid "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
@@@ -7710,69 -6141,67 +7726,84 @@@ msgstr "无法存储指纹:%s\n
  msgid "failed to store the creation date: %s\n"
  msgstr "无法存储创建日期:%s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "从卡中获取 CHV 状态时出错\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "响应未包含 RSA 余数\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "响应未包含 RSA 公钥指数\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "响应未包含公钥数据\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "无法读出公钥:%s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
  #, c-format
- msgid "using default PIN as %s\n"
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2005
  #, c-format
- msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgid "%sNumber: %s%%0AHolder: %s%s"
  msgstr ""
  
- #: scd/app-openpgp.c:1929
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
  #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
+ #, c-format
+ msgid "using default PIN as %s\n"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2084
+ #, c-format
+ msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+ msgstr ""
  
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
++#: scd/app-openpgp.c:2097
  #, fuzzy
- msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "验证 CHV%d 失败:%s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "从卡中获取 CHV 状态时出错\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "卡被永久锁定!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7782,27 -6211,22 +7813,27 @@@ msgstr[0] "尝试管理员 PIN %d 次�
  msgstr[1] "尝试管理员 PIN %d 次后,卡将被永久锁定!\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:2086
- #, fuzzy, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "尚未配置管理员命令的权限\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ #, fuzzy
+ msgid "||Please enter the PIN"
+ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+ 
++#: scd/app-openpgp.c:2619
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, fuzzy, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
@@@ -7810,82 -6234,64 +7841,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新的管理员 PIN"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "新的 PIN"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "读取应用程序数据时出错\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "读取指纹 D0 出错\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "密钥已存在\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "现有的密钥将被替换\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  #, fuzzy
  msgid "writing new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "缺少创建时间戳\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "无法存储密钥:%s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "未被支持的 URI"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "请稍候,正在生成密钥……\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "生成密钥失败\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7893,30 -6299,24 +7924,30 @@@ msgid_plural "key generation completed 
  msgstr[0] "密钥已生成(耗时 %d 秒)\n"
  msgstr[1] "密钥已生成(耗时 %d 秒)\n"
  
- #: scd/app-openpgp.c:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡不支持散列算法 %s\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前已创建的签名:%lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前禁止通过此命令验证管理员 PIN\n"
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@@ -7938,54 -6335,42 +7969,54 @@@ msgstr "新的 PIN
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  #, fuzzy
  msgid "|FILE|write a log to FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr ""
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr ""
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr ""
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr ""
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  #, fuzzy
  msgid "deny the use of admin card commands"
  msgstr "显示管理员命令"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr ""
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7995,22 -6379,14 +8026,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
- #: sm/base64.c:327
- #, fuzzy, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "跳过无效的 64 进制字符 %02x\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -8028,12 -6401,10 +8054,12 @@@ msgstr "
  msgid "shell"
  msgstr ""
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "不支持 gpg-agent 协议版本 %d\n"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8046,12 -6415,10 +8072,12 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "无法打开‘%s’:%s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "不允许导出私钥\n"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  #, fuzzy
  msgid "certificate policy not allowed"
  msgstr "不允许导出私钥\n"
@@@ -8079,9 -6441,6 +8105,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
@@@ -8104,12 -6459,10 +8130,12 @@@ msgstr "
  msgid "checking the CRL failed: %s"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr ""
  
@@@ -8122,7 -6473,6 +8148,7 @@@ msgstr "不允许导出私钥\n
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  #, fuzzy
  msgid "certificate has expired"
  msgstr "这把密钥已经过期!"
@@@ -8179,7 -6518,6 +8205,7 @@@ msgstr "证书已损坏
  msgid "  (     issuer valid from "
  msgstr "卡序列号 ="
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "CA 指纹:"
@@@ -8209,7 -6541,6 +8235,7 @@@ msgstr "生成一份吊销证书
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr ""
  
@@@ -8218,29 -6548,23 +8244,29 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "验证签名"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "首选项‘%s’重复\n"
@@@ -8269,11 -6588,9 +8295,11 @@@ msgstr "
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  #, fuzzy
  msgid "none"
  msgstr "no"
@@@ -8309,36 -6621,28 +8335,36 @@@ msgstr "
  "“%.*s”\n"
  "%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr ""
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr ""
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr ""
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
@@@ -8433,72 -6719,58 +8459,72 @@@ msgstr "建立钥匙环‘%s’时发�
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "生成密钥失败:%s\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (仅用于签名)\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
  msgstr "  (2) 加密密钥\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
  msgstr "%s:读取自由记录时出错:%s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "禁用密钥"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, fuzzy, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "%s 密钥可能的操作:"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  #, fuzzy
  msgid "No subject name given\n"
  msgstr "(不给定描述)\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "无效的‘%s’散列算法\n"
@@@ -8508,83 -6780,66 +8534,83 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  #, fuzzy
  msgid "Enter email addresses"
  msgstr "电子邮件地址:"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
  "输入用户标识。以空白行结束:"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "请输入新的文件名"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
  msgstr "请输入描述(可选);以空白行结束:\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  #, fuzzy
  msgid "Enter URIs"
  msgstr "输入 PIN:"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
  msgstr "要为这把密钥建立一份指定吊销者证书吗?(y/N)"
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
  msgstr "已建立吊销证书。\n"
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr ""
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr ""
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
@@@ -8726,7 -6950,6 +8752,7 @@@ msgstr "从这个钥匙环里取用密�
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr ""
  
@@@ -8815,17 -7022,14 +8841,17 @@@ msgstr "生成一份吊销证书
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -8889,7 -7082,6 +8915,7 @@@ msgid "
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8903,167 -7094,137 +8929,172 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "保护算法 %d%s 未被支持\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  #, fuzzy
  msgid "Signature made "
  msgstr "签名建立于 %s\n"
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr ""
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  #, fuzzy
  msgid "Good signature from"
  msgstr "完好的签名,来自于“%s”"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  #, fuzzy
  msgid "                aka"
  msgstr "              亦即“%s”"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr "这将是一个自身签名。\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr ""
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr ""
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "首选项‘%s’重复\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "已建立吊销证书。\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "首选项‘%s’重复\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "CA 指纹:"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr ""
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr ""
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "证书已损坏"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "生成密码的时候发生错误:%s\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "已建立吊销证书。\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "首选项‘%s’重复\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "指纹无效"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  #, fuzzy
  msgid "no issuer found in certificate\n"
  msgstr "生成一份吊销证书"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
@@@ -9100,7 -7255,6 +9131,7 @@@ msgstr "无法读出公钥:%s\n
  msgid "not removing file '%s'\n"
  msgstr "进行 ASCII 封装失败:%s\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "‘%s’中出错:%s\n"
@@@ -9327,7 -7437,6 +9358,7 @@@ msgstr "
  msgid "error getting data from cache file: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9342,12 -7449,10 +9373,12 @@@ msgstr "
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "无法读出公钥:%s\n"
@@@ -9398,150 -7494,121 +9429,150 @@@ msgstr "
  msgid "CRL signature verification failed: %s\n"
  msgstr "签名验证已被抑制\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
  msgstr "更新私钥失败:%s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "%s:写入目录记录时出错:%s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr "警告:随机数种子文件大小无效――未使用\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s:读取自由记录时出错:%s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, fuzzy, c-format
  #| msgid "error reading keyblock: %s\n"
  msgid "problem reading cache key: %s\n"
  msgstr "读取密钥区块时发生错误:%s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr ""
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "无法读出公钥:%s\n"
@@@ -9550,51 -7616,39 +9581,51 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
  msgstr "%s:写入目录记录时出错:%s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
  msgstr "太多对称加密算法首选项\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "建立‘%s’时发生错误:%s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "找不到私钥“%s”:%s\n"
@@@ -9748,117 -7773,89 +9779,117 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "要不保存而离开吗?(y/N)"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9871,95 -7868,76 +9902,95 @@@ msgstr "
  "@\n"
  "(请参考在线说明以获得所有命令和选项的完整清单)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "用法:gpg [选项] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  #, 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:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, 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:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "列太长"
  
- #: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
++#: dirmngr/dirmngr.c:1618 dirmngr/dirmngr.c:1702
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "指纹无效"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, 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:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "可选"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10205,38 -8135,31 +10236,38 @@@ msgstr "
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr ""
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
  msgstr "%s:无效的文件版本%d\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "更新私钥失败:%s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10270,257 -8187,201 +10301,253 @@@ msgstr "读取‘%s’时出错:%s\n
  msgid "error building OCSP request: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "无法读出公钥:%s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
  msgstr "生成一份吊销证书"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "无法存储密钥:%s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "无法存取‘%s’:%s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
  msgstr "没有默认的私钥钥匙环: %s\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
  msgstr "使用对称加密算法 %s\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr ""
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "注意:密钥已被吊销"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr ""
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "不能创建备份文件‘%s’:%s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, 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:2552
++#: dirmngr/server.c:2620
  #, 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:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
  msgstr "正在检查信任度数据库\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr ""
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  #, fuzzy
  msgid "checking CRL for"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "验证签名"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "首选项‘%s’重复\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA 要求使用 160 位的散列算法\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
@@@ -10617,192 -8457,145 +10644,192 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr ""
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr ""
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr ""
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr ""
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr ""
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr ""
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
  msgstr "从导出的子钥中删除所有密码"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr ""
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|某甲|为收件者“某甲”加密"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr ""
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr ""
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  #, fuzzy
  #| msgid "network error"
  msgid "Network"
  msgstr "网络错误"
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  msgid "Passphrase Entry"
  msgstr "错误的密码"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "找不到公钥"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  msgid "error closing '%s'\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error parsing '%s'\n"
diff --cc po/zh_TW.po
index ce9edbc,df869c9..04b076f
--- 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: 2017-01-23 21:37+0100\n"
++"POT-Creation-Date: 2017-03-01 16:34+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"
@@@ -21,7 -20,6 +21,7 @@@
  "Plural-Forms: nplurals=1; plural=0;\n"
  "X-Generator: Poedit 1.5.7\n"
  
- #: agent/call-pinentry.c:259
++#: agent/call-pinentry.c:296
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
@@@ -32,47 -30,38 +32,47 @@@
  #. 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
++#: agent/call-pinentry.c:499
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:463
++#: agent/call-pinentry.c:500
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|取消 (_C)"
  
- #: agent/call-pinentry.c:464
++#: agent/call-pinentry.c:501
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:465
++#: agent/call-pinentry.c:502
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:466
++#: agent/call-pinentry.c:503
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|個人識別碼 (PIN):"
  
- #: agent/call-pinentry.c:467
++#: agent/call-pinentry.c:504
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|取消 (_C)"
  
- #: agent/call-pinentry.c:468
++#: agent/call-pinentry.c:505
  #, fuzzy
  #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
  
- #: agent/call-pinentry.c:470
++#: agent/call-pinentry.c:507
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:471
++#: agent/call-pinentry.c:508
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -80,7 -69,6 +80,7 @@@ msgstr "請輸入新密語
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:772
++#: agent/call-pinentry.c:840
  msgid "Quality:"
  msgstr "優劣程度: %s"
  
@@@ -90,71 -78,55 +90,71 @@@
  #. 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
++#: agent/call-pinentry.c:861
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "上列輸入文字的優劣程度.\n"
  "關於此規範的細節, 請洽你的系統管理者."
  
- #: agent/call-pinentry.c:902
++#: agent/call-pinentry.c:989
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
  
- #: agent/call-pinentry.c:905
++#: agent/call-pinentry.c:992
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "密語:"
  
- #: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3102 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "前後不一致 - 請再試一次"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:989
++#: agent/call-pinentry.c:1076
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
  
- #: agent/call-pinentry.c:1000
++#: agent/call-pinentry.c:1087
  msgid "Repeat:"
  msgstr "重複:"
  
- #: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
++#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
  msgid "PIN too long"
  msgstr "個人識別碼 (PIN) 太長"
  
- #: agent/call-pinentry.c:1030
++#: agent/call-pinentry.c:1117
  msgid "Passphrase too long"
  msgstr "密語太長"
  
- #: agent/call-pinentry.c:1038
++#: agent/call-pinentry.c:1125
  msgid "Invalid characters in PIN"
  msgstr "個人識別碼 (PIN) 含有無效的字符"
  
- #: agent/call-pinentry.c:1043
++#: agent/call-pinentry.c:1130
  msgid "PIN too short"
  msgstr "個人識別碼 (PIN) 太短"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad PIN"
  msgstr "不良的個人識別碼 (PIN)"
  
- #: agent/call-pinentry.c:1056
++#: agent/call-pinentry.c:1143
  msgid "Bad Passphrase"
  msgstr "不良的密語"
  
@@@ -163,49 -134,35 +163,57 @@@
  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:1261 g10/gpg.c:1306 g10/keygen.c:4579
- #: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:843 g10/sign.c:1146 g10/tdbio.c:715
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1306 g10/keygen.c:4597
++#: g10/keyring.c:1340 g10/keyring.c:1675 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:850 g10/sign.c:1153 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:1307
- #: g10/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3683
- #: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: 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/import.c:319 g10/import.c:462 g10/import.c:635 g10/keygen.c:3669
++#: g10/keyring.c:1701 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:832 g10/sign.c:1032
++#: g10/sign.c:1137 g10/sign.c:1282 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:1561
++#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1640
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "無法開啟 '%s': %s\n"
  
- #: agent/command-ssh.c:2415 agent/command-ssh.c:2433
++#: agent/command-ssh.c:2400 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614
  #, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "取得此卡片序號時出錯: %s\n"
  
- #: agent/command-ssh.c:2419
++#: agent/command-ssh.c:2448
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "偵測到卡片, 其序號為: %s\n"
  
- #: agent/command-ssh.c:2424
++#: agent/command-ssh.c:2453
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
  
- #: agent/command-ssh.c:2444
++#: agent/command-ssh.c:2473
  #, c-format
  msgid "no suitable card key found: %s\n"
  msgstr "找不到合適的卡片金鑰: %s\n"
  
- #: agent/command-ssh.c:2709
++#: agent/command-ssh.c:2602
+ #, fuzzy, c-format
+ #| msgid "error getting stored flags: %s\n"
+ msgid "error getting list of cards: %s\n"
+ msgstr "取得已存放的旗標時出錯: %s\n"
+ 
++#: agent/command-ssh.c:2775
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -213,24 -170,19 +221,24 @@@
  msgstr ""
  "有某個 ssh 程序提出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請問是否允許?"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Allow"
  msgstr "允許"
  
- #: agent/command-ssh.c:2716
++#: agent/command-ssh.c:2782
  msgid "Deny"
  msgstr "拒絕"
  
- #: agent/command-ssh.c:2725
++#: agent/command-ssh.c:2791
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2964 agent/genkey.c:351
++#: agent/command-ssh.c:3030 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "請再次輸入密語"
  
- #: agent/command-ssh.c:2991
++#: agent/command-ssh.c:3057
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -238,68 -190,53 +246,68 @@@
  msgstr ""
  "請輸入密語以保護收到的私鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
  
- #: agent/command-ssh.c:3511
++#: agent/command-ssh.c:3617
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "從 socket 建立串流失敗: %s\n"
  
- #: agent/divert-scd.c:98 g10/call-agent.c:1101
++#: agent/divert-scd.c:115 g10/call-agent.c:1101
  msgid "Please insert the card with serial number"
  msgstr "請插入下列序號的卡片:"
  
- #: agent/divert-scd.c:99 g10/call-agent.c:1102
++#: agent/divert-scd.c:116 g10/call-agent.c:1102
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "請移除現用中的卡片並插入下列序號的卡片:"
  
- #: agent/divert-scd.c:210
++#: agent/divert-scd.c:244
  msgid "Admin PIN"
  msgstr "管理者個人識別碼 (PIN)"
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
- #: agent/divert-scd.c:215
++#: agent/divert-scd.c:249
  msgid "PUK"
  msgstr "PIN 重設碼 (PUK)"
  
- #: agent/divert-scd.c:222
++#: agent/divert-scd.c:256
  msgid "Reset Code"
  msgstr "重設碼"
  
- #: agent/divert-scd.c:248
++#: agent/divert-scd.c:282
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
  
- #: agent/divert-scd.c:297
++#: agent/divert-scd.c:354
  msgid "Repeat this Reset Code"
  msgstr "請再次輸入重設碼"
  
- #: agent/divert-scd.c:299
++#: agent/divert-scd.c:356
  msgid "Repeat this PUK"
  msgstr "請再次輸入 PUK"
  
- #: agent/divert-scd.c:300
++#: agent/divert-scd.c:357
  msgid "Repeat this PIN"
  msgstr "請再次輸入個人識別碼 (PIN)"
  
- #: agent/divert-scd.c:305
++#: agent/divert-scd.c:362
  msgid "Reset Code not correctly repeated; try again"
  msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
  
- #: agent/divert-scd.c:307
++#: agent/divert-scd.c:364
  msgid "PUK not correctly repeated; try again"
  msgstr "前後兩次輸入的 PUK 不一致; 請再試一次"
  
- #: agent/divert-scd.c:308
++#: agent/divert-scd.c:365
  msgid "PIN not correctly repeated; try again"
  msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
  
- #: agent/divert-scd.c:320
++#: agent/divert-scd.c:378
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
  
- #: agent/genkey.c:110 sm/certreqgen-ui.c:394
++#: agent/genkey.c:110 sm/certreqgen-ui.c:390
  #, c-format
  msgid "error creating temporary file: %s\n"
  msgstr "建立暫存檔時出錯: %s\n"
@@@ -377,47 -300,32 +385,47 @@@ msgstr "
  "@選項:\n"
  " "
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:158
  msgid "run in daemon mode (background)"
  msgstr "以服務模式執行 (背景)"
  
- #: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:155
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:157
  msgid "run in server mode (foreground)"
  msgstr "以伺服器模式執行 (前景)"
  
- #: agent/gpg-agent.c:154 dirmngr/dirmngr.c:158
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "run in server mode"
  msgid "run in supervised mode"
  msgstr "以伺服器模式執行"
  
- #: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:156 g10/gpg.c:587 g10/gpgv.c:76 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
++#: dirmngr/dirmngr.c:172 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:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:171
++#: agent/gpg-agent.c:157 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:173
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "盡量安靜些"
  
- #: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:174
  msgid "sh-style command output"
  msgstr "sh 樣式的指令輸出"
  
- #: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:175
  msgid "csh-style command output"
  msgstr "csh 樣式的指令輸出"
  
 +#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:334
- #: dirmngr/dirmngr.c:174 tools/symcryptrun.c:169
++#: dirmngr/dirmngr.c:176 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|檔案|從指定檔案中讀取選項"
  
- #: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:177
++#: agent/gpg-agent.c:169 scd/scdaemon.c:130 dirmngr/dirmngr.c:179
  msgid "do not detach from the console"
  msgstr "不要從 console 分離"
  
@@@ -496,11 -387,6 +504,11 @@@ 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:483 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
++#: g10/gpg.c:1025 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:378
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
 +#: 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"
  
@@@ -516,43 -400,30 +524,43 @@@ msgstr "
  "語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 私鑰管理\n"
  
- #: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:345 sm/gpgsm.c:704
- #: dirmngr/dirmngr.c:442
++#: agent/gpg-agent.c:539 g10/gpg.c:1216 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: dirmngr/dirmngr.c:462
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "給定的除錯等級 '%s' 無效\n"
  
- #: agent/gpg-agent.c:1086 g10/gpg.c:2506 scd/scdaemon.c:498 sm/gpgsm.c:1037
- #: dirmngr/dirmngr.c:816
++#: agent/gpg-agent.c:1086 g10/gpg.c:2508 scd/scdaemon.c:499 sm/gpgsm.c:1037
++#: dirmngr/dirmngr.c:891
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "請注意: 沒有預設選項檔 '%s'\n"
  
- #: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2510
- #: scd/scdaemon.c:503 sm/gpgsm.c:1041 dirmngr/dirmngr.c:821
- #: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1097 agent/gpg-agent.c:1947 g10/gpg.c:2512
++#: scd/scdaemon.c:504 sm/gpgsm.c:1041 dirmngr/dirmngr.c:896
++#: dirmngr/dirmngr.c:1746 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "選項檔 '%s': %s\n"
  
- #: agent/gpg-agent.c:1105 g10/gpg.c:2517 scd/scdaemon.c:511 sm/gpgsm.c:1048
- #: dirmngr/dirmngr.c:829
++#: agent/gpg-agent.c:1105 g10/gpg.c:2519 scd/scdaemon.c:512 sm/gpgsm.c:1048
++#: dirmngr/dirmngr.c:904
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "從 '%s' 讀取選項中\n"
  
- #: agent/gpg-agent.c:1227 g10/gpg.c:3653 scd/scdaemon.c:631 sm/gpgsm.c:1531
- #: dirmngr/dirmngr.c:933 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
++#: agent/gpg-agent.c:1227 g10/gpg.c:3657 scd/scdaemon.c:631 sm/gpgsm.c:1531
++#: dirmngr/dirmngr.c:1008 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:528
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "請注意: '%s' 並不當成選項\n"
  
- #: agent/gpg-agent.c:2092 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1078
++#: agent/gpg-agent.c:2092 scd/scdaemon.c:1070 dirmngr/dirmngr.c:1153
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "無法建立 socket: %s\n"
  
- #: agent/gpg-agent.c:2109 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1091
++#: agent/gpg-agent.c:2109 scd/scdaemon.c:1083 dirmngr/dirmngr.c:1166
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "socket 名稱 '%s' 太長\n"
@@@ -561,28 -431,22 +569,28 @@@
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
  
- #: agent/gpg-agent.c:2157 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1123
++#: agent/gpg-agent.c:2157 scd/scdaemon.c:1107 dirmngr/dirmngr.c:1198
  msgid "error getting nonce for the socket\n"
  msgstr "為 socket 取得 nonce 時出錯\n"
  
- #: agent/gpg-agent.c:2162 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1126
++#: agent/gpg-agent.c:2162 scd/scdaemon.c:1110 dirmngr/dirmngr.c:1201
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
  
- #: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1126
- #: dirmngr/dirmngr.c:1135
++#: agent/gpg-agent.c:2172 agent/gpg-agent.c:2209 scd/scdaemon.c:1118
++#: dirmngr/dirmngr.c:1210
  #, 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:2177 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1140
++#: agent/gpg-agent.c:2177 scd/scdaemon.c:1123 dirmngr/dirmngr.c:1215
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() 失敗: %s\n"
  
- #: agent/gpg-agent.c:2184 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1146
++#: agent/gpg-agent.c:2184 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1221
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在候聽 socket '%s'\n"
@@@ -609,7 -467,6 +617,7 @@@ msgstr "'%s' 的 stat() 失敗: %s\n
  msgid "can't use '%s' as home directory\n"
  msgstr "無法使用 '%s' 做為家目錄\n"
  
- #: agent/gpg-agent.c:2404 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1869
++#: agent/gpg-agent.c:2404 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1948
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
@@@ -634,12 -487,10 +642,12 @@@ msgstr "ssh 經手程式 0x%lx (用於 
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
  
- #: agent/gpg-agent.c:2893 scd/scdaemon.c:1277 dirmngr/dirmngr.c:2073
++#: agent/gpg-agent.c:2893 scd/scdaemon.c:1300 dirmngr/dirmngr.c:2152
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
  
- #: agent/gpg-agent.c:2966 scd/scdaemon.c:1326
++#: agent/gpg-agent.c:2966 scd/scdaemon.c:1357
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 已停止\n"
@@@ -661,8 -508,6 +669,8 @@@ msgstr "
  "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
  "密碼快取維護\n"
  
 +#: 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
++#: dirmngr/dirmngr.c:155 tools/gpgconf.c:71
  msgid ""
  "@Commands:\n"
  " "
@@@ -670,9 -515,6 +678,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: 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
++#: agent/protect-tool.c:115 g10/gpg.c:532 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: sm/gpgsm.c:246 dirmngr/dirmngr.c:170 tools/gpg-connect-agent.c:75
 +#: tools/gpgconf.c:96 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -725,8 -559,6 +733,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
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1548
 +#: tools/gpgconf.c:328
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -784,8 -607,6 +792,8 @@@ msgstr "請問你是否徹底信任%%0
  msgid "Yes"
  msgstr "Yes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/trustlist.c:673 agent/findkey.c:1484 agent/findkey.c:1498
 +#: common/audit.c:469
  msgid "No"
  msgstr "No"
  
@@@ -835,7 -649,6 +843,7 @@@ msgstr "更改密語
  msgid "I'll change it later"
  msgstr "我稍後再變更"
  
- #: agent/findkey.c:1438
++#: agent/findkey.c:1460
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -843,11 -656,9 +851,11 @@@
  "%%0A?"
  msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
  
- #: agent/findkey.c:1462 agent/findkey.c:1476
++#: agent/findkey.c:1484 agent/findkey.c:1498
  msgid "Delete key"
  msgstr "刪除金鑰"
  
- #: agent/findkey.c:1473
++#: agent/findkey.c:1495
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -869,7 -677,6 +877,7 @@@ msgstr "金鑰 %s 使用不安全 (%u �
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
  
- #: agent/pksign.c:508
++#: agent/pksign.c:517
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "檢查已建立的簽章時出錯: %s\n"
@@@ -893,22 -696,14 +901,22 @@@ 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:441
- #: common/exechelp-w32.c:465 common/exechelp-w32.c:495
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:449
++#: common/exechelp-w32.c:473 common/exechelp-w32.c:503
 +#: dirmngr/ldap-wrapper.c:711
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "建立管道時出錯: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:347
- #: common/exechelp-w32.c:451 common/exechelp-w32.c:475
- #: common/exechelp-w32.c:505
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
++#: common/exechelp-w32.c:459 common/exechelp-w32.c:483
++#: common/exechelp-w32.c:513
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "建立管道串流時出錯: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1164
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1239
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "衍生執行程序時出錯: %s\n"
@@@ -923,8 -716,6 +931,8 @@@ msgstr "等候 %d 處理程序終止時
  msgid "error running '%s': probably not installed\n"
  msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
  
 +#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
- #: common/exechelp-w32.c:788 common/exechelp-w32ce.c:781
++#: common/exechelp-w32.c:796 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
@@@ -934,13 -724,11 +942,13 @@@
  msgid "error running '%s': terminated\n"
  msgstr "執行 '%s' 時出錯: 已終止\n"
  
- #: common/exechelp-posix.c:750 common/exechelp-w32.c:769
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for processes to terminate failed: %s\n"
  msgstr "等候 %d 處理程序終止時失敗: %s\n"
  
- #: common/exechelp-w32.c:781 common/exechelp-w32ce.c:775
++#: common/exechelp-w32.c:789 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
@@@ -1156,8 -898,6 +1164,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:3102
++#: scd/app-openpgp.c:3257
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "未支援的演算法: %s"
@@@ -1277,7 -990,10 +1285,12 @@@ msgstr "忽略垃圾列
  msgid "[none]"
  msgstr "[ 無 ]"
  
++#: common/ksba-io-support.c:338
+ #, c-format
+ msgid "invalid radix64 character %02x skipped\n"
+ msgstr "已跳過無效的 radix64 字符 %02x\n"
+ 
 +#: common/argparse.c:365
  msgid "argument not expected"
  msgstr "沒料到有引數"
  
@@@ -1343,7 -1045,6 +1356,7 @@@ msgstr "\"%.50s\" 選項不明確\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "\"%.50s\" 指令不明確\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1182
++#: common/argparse.c:401 dirmngr/dirmngr.c:1257
  msgid "out of core\n"
  msgstr "超出核心\n"
  
@@@ -1401,8 -1091,6 +1414,8 @@@ msgstr "未鎖定 '%s': %s\n
  msgid "waiting for lock %s...\n"
  msgstr "正在等候 `%s' 鎖定...\n"
  
- #: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:729
- #: dirmngr/dirmngr.c:738
++#: common/init.c:185 sm/gpgsm.c:937 dirmngr/dirmngr.c:800
++#: dirmngr/dirmngr.c:809
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@@ -1562,8 -1217,6 +1575,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:2030
- #: g10/keygen.c:4089 g10/revoke.c:215 g10/revoke.c:618
++#: g10/keygen.c:4075 g10/revoke.c:215 g10/revoke.c:618
  msgid "can't do this in batch mode\n"
  msgstr "無法在批次模式中這樣做\n"
  
@@@ -1571,14 -1223,9 +1584,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "祇有第二版卡片纔能用這個指令\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2458
++#: g10/card-util.c:109 scd/app-openpgp.c:2613
  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:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1770
- #: g10/keygen.c:1947 g10/keygen.c:2315 sm/certreqgen-ui.c:169
- #: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
++#: g10/keyedit.c:1003 g10/keyedit.c:1024 g10/keyedit.c:1038 g10/keygen.c:1771
++#: g10/keygen.c:1932 g10/keygen.c:2300 sm/certreqgen-ui.c:165
++#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
  msgid "Your selection? "
  msgstr "你要選哪一個? "
  
@@@ -1640,16 -1273,10 +1653,16 @@@ 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:348
 +#: g10/import.c:606 g10/import.c:654 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1507 tools/gpgconf.c:341 tools/gpgconf.c:387
++#: dirmngr/dirmngr.c:1586 tools/gpgconf.c:341 tools/gpgconf.c:387
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "讀取 '%s' 時出錯: %s\n"
  
- #: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2335
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2378
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "寫入 '%s' 時出錯: %s\n"
@@@ -1709,7 -1323,6 +1722,7 @@@ msgstr "不可能進行金鑰操作: %s
  msgid "not an OpenPGP card"
  msgstr "這不是 OpenPGP 卡片"
  
- #: g10/card-util.c:1173 g10/keygen.c:4108 g10/keygen.c:5094
++#: g10/card-util.c:1173 g10/keygen.c:4094 g10/keygen.c:5118
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得現用金鑰資訊時出錯: %s\n"
@@@ -1743,13 -1351,10 +1756,13 @@@ msgstr "你的加密金鑰想要用多�
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/card-util.c:1316 g10/keygen.c:2124 g10/keygen.c:2156
- #: sm/certreqgen-ui.c:198
++#: g10/card-util.c:1316 g10/keygen.c:2109 g10/keygen.c:2141
++#: sm/certreqgen-ui.c:194
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/card-util.c:1324 g10/keygen.c:2209 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2194 sm/certreqgen-ui.c:184
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@@ -1803,9 -1398,6 +1816,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:1508
- #: g10/keygen.c:1796 g10/keygen.c:1824 g10/keygen.c:1954 g10/keygen.c:2062
- #: g10/keygen.c:2338 g10/revoke.c:820
++#: g10/keygen.c:1797 g10/keygen.c:1825 g10/keygen.c:1939 g10/keygen.c:2047
++#: g10/keygen.c:2323 g10/revoke.c:820
  msgid "Invalid selection.\n"
  msgstr "無效的選擇.\n"
  
@@@ -1932,22 -1495,14 +1945,22 @@@ msgstr "無效的指令  (試試看 \"h
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在這個指令中沒有作用\n"
  
- #: g10/decrypt.c:246 g10/gpg.c:4914 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:246 g10/gpg.c:4922 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:1860 g10/export.c:2137 g10/export.c:2216
- #: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4868 g10/keyedit.c:2051
++#: g10/delkey.c:79 g10/export.c:1863 g10/export.c:2138 g10/export.c:2259
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4872 g10/keyedit.c:2051
 +#: g10/keyedit.c:3091 g10/keyedit.c:4713 g10/keylist.c:656
 +#: 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:1928 g10/getkey.c:1904 g10/getkey.c:4232
- #: g10/gpg.c:4876 g10/keyedit.c:2904 g10/keyedit.c:2991 g10/keyserver.c:1260
++#: g10/delkey.c:88 g10/export.c:1931 g10/getkey.c:1904 g10/getkey.c:4232
++#: g10/gpg.c:4880 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 -1548,6 +2018,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:1294
++#: g10/encrypt.c:232 g10/sign.c:1301
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "建立密語時出錯: %s\n"
@@@ -2040,7 -1576,6 +2053,7 @@@ msgid "
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
  
- #: g10/encrypt.c:707 g10/sign.c:986
++#: g10/encrypt.c:707 g10/sign.c:993
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2156,36 -1667,27 +2169,36 @@@ msgstr "匯出時盡可能地從金鑰�
  msgid "use the GnuPG key backup format"
  msgstr ""
  
- #: g10/export.c:1232
++#: g10/export.c:1235
  msgid " - skipped"
  msgstr " - 已跳過"
  
- #: g10/export.c:1265 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
- #: g10/sign.c:847 g10/sign.c:1150
++#: g10/export.c:1268 g10/import.c:1560 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:854 g10/sign.c:1157
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "正在寫入 '%s'\n"
  
- #: g10/export.c:1691
++#: g10/export.c:1694
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
  
- #: g10/export.c:1877
++#: g10/export.c:1880
  msgid "exporting secret keys not allowed\n"
  msgstr "不允許匯出私鑰\n"
  
- #: g10/export.c:1954
++#: g10/export.c:1957
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
  
- #: g10/export.c:2042
++#: g10/export.c:2043
  msgid "WARNING: nothing exported\n"
  msgstr "警告: 沒有匯出任何東西\n"
  
- #: g10/export.c:2299 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2342 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"
@@@ -2451,7 -1892,6 +2464,7 @@@ msgstr "|N|設定壓縮等級為 N (0 �
  msgid "use canonical text mode"
  msgstr "使用標準的文字模式"
  
- #: g10/gpg.c:583 g10/gpgv.c:78 sm/gpgsm.c:302
++#: g10/gpg.c:583 g10/gpgv.c:80 sm/gpgsm.c:302
  msgid "|FILE|write output to FILE"
  msgstr "|檔案|將輸出寫入至指定檔案"
  
@@@ -2624,454 -2036,356 +2637,458 @@@ msgstr "警告: 延伸模組 '%s' 的�
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的組態項目 '%s'\n"
  
- #: g10/gpg.c:1925
++#: g10/gpg.c:1927
  msgid "display photo IDs during key listings"
  msgstr "列出金鑰時顯示照片 ID"
  
- #: g10/gpg.c:1927
++#: g10/gpg.c:1929
  msgid "show key usage information during key listings"
  msgstr "列出金鑰時顯示金鑰用途資訊"
  
- #: g10/gpg.c:1929
++#: g10/gpg.c:1931
  msgid "show policy URLs during signature listings"
  msgstr "列出簽章時顯示原則 URL"
  
- #: g10/gpg.c:1931
++#: g10/gpg.c:1933
  msgid "show all notations during signature listings"
  msgstr "列出簽章時顯示所有的註記"
  
- #: g10/gpg.c:1933
++#: g10/gpg.c:1935
  msgid "show IETF standard notations during signature listings"
  msgstr "列出簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:1937
++#: g10/gpg.c:1939
  msgid "show user-supplied notations during signature listings"
  msgstr "列出簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:1939
++#: g10/gpg.c:1941
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:1941
++#: g10/gpg.c:1943
  msgid "show user ID validity during key listings"
  msgstr "列出金鑰時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:1943
++#: g10/gpg.c:1945
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:1945
++#: g10/gpg.c:1947
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
  
- #: g10/gpg.c:1947
++#: g10/gpg.c:1949
  msgid "show the keyring name in key listings"
  msgstr "在金鑰清單中顯示鑰匙圈名稱"
  
- #: g10/gpg.c:1949
++#: g10/gpg.c:1951
  msgid "show expiration dates during signature listings"
  msgstr "列出簽章時顯示有效期限"
  
- #: g10/gpg.c:2051 g10/gpg.c:2088
++#: g10/gpg.c:2053 g10/gpg.c:2090
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "valid values for option '%s':\n"
  msgstr "選項 \"%.50s\" 的引數無效\n"
  
- #: g10/gpg.c:2062
++#: g10/gpg.c:2064
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的選項 '%s'\n"
  
- #: g10/gpg.c:2064 g10/gpg.c:2100
++#: g10/gpg.c:2066 g10/gpg.c:2102
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2098 g10/keygen.c:167
++#: g10/gpg.c:2100 g10/keygen.c:168
  #, fuzzy, c-format
  #| msgid "invalid argument for option \"%.50s\"\n"
  msgid "invalid value for option '%s'\n"
  msgstr "選項 \"%.50s\" 的引數無效\n"
  
- #: g10/gpg.c:2235
++#: g10/gpg.c:2237
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
  
- #: g10/gpg.c:2839 g10/gpg.c:3620 g10/gpg.c:3632
++#: g10/gpg.c:2841 g10/gpg.c:3624 g10/gpg.c:3636
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "請注意: 一般情況下不採用 %s!\n"
  
- #: g10/gpg.c:3011 g10/gpg.c:3023
++#: g10/gpg.c:3013 g10/gpg.c:3025
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' 不是有效的簽章使用期限\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3047
  #, 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:3077 sm/gpgsm.c:1158
++#: g10/gpg.c:3079 sm/gpgsm.c:1158
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無效的個人識別碼項目模式 '%s'\n"
  
- #: g10/gpg.c:3130
++#: g10/gpg.c:3134
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' 不是有效的字元集\n"
  
- #: g10/gpg.c:3152 g10/gpg.c:3357 g10/keyedit.c:5436
++#: g10/gpg.c:3156 g10/gpg.c:3361 g10/keyedit.c:5436
  msgid "could not parse keyserver URL\n"
  msgstr "無法剖析金鑰伺服器 URL\n"
  
- #: g10/gpg.c:3170
++#: g10/gpg.c:3174
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3173
++#: g10/gpg.c:3177
  msgid "invalid keyserver options\n"
  msgstr "無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3180
++#: g10/gpg.c:3184
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無效的匯入選項\n"
  
- #: g10/gpg.c:3183
++#: g10/gpg.c:3187
  msgid "invalid import options\n"
  msgstr "無效的匯入選項\n"
  
- #: g10/gpg.c:3189 g10/gpg.c:3204
++#: g10/gpg.c:3193 g10/gpg.c:3208
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3195
++#: g10/gpg.c:3199
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無效的匯出選項\n"
  
- #: g10/gpg.c:3198
++#: g10/gpg.c:3202
  msgid "invalid export options\n"
  msgstr "無效的匯出選項\n"
  
- #: g10/gpg.c:3210
++#: g10/gpg.c:3214
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無效的清單選項\n"
  
- #: g10/gpg.c:3213
++#: g10/gpg.c:3217
  msgid "invalid list options\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3221
++#: g10/gpg.c:3225
  msgid "display photo IDs during signature verification"
  msgstr "驗證簽章時顯示照片 ID"
  
- #: g10/gpg.c:3223
++#: g10/gpg.c:3227
  msgid "show policy URLs during signature verification"
  msgstr "驗證簽章時顯示原則 URL"
  
- #: g10/gpg.c:3225
++#: g10/gpg.c:3229
  msgid "show all notations during signature verification"
  msgstr "驗證簽章時顯示所有的註記"
  
- #: g10/gpg.c:3227
++#: g10/gpg.c:3231
  msgid "show IETF standard notations during signature verification"
  msgstr "驗證簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:3231
++#: g10/gpg.c:3235
  msgid "show user-supplied notations during signature verification"
  msgstr "驗證簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:3233
++#: g10/gpg.c:3237
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:3235
++#: g10/gpg.c:3239
  msgid "show user ID validity during signature verification"
  msgstr "驗證簽章時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:3237
++#: g10/gpg.c:3241
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:3239
++#: g10/gpg.c:3243
  msgid "show only the primary user ID in signature verification"
  msgstr "驗證簽章時祇顯示主要的使用者 ID"
  
- #: g10/gpg.c:3241
++#: g10/gpg.c:3245
  msgid "validate signatures with PKA data"
  msgstr "以 PKA 資料驗證簽章"
  
- #: g10/gpg.c:3243
++#: g10/gpg.c:3247
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提高對持有有效 PKA 資料之簽章的信任"
  
- #: g10/gpg.c:3250
++#: g10/gpg.c:3254
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無效的驗證選項\n"
  
- #: g10/gpg.c:3253
++#: g10/gpg.c:3257
  msgid "invalid verify options\n"
  msgstr "無效的驗證選項\n"
  
- #: g10/gpg.c:3260
++#: g10/gpg.c:3264
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "無法把執行檔路徑設成 %s\n"
  
- #: g10/gpg.c:3452
++#: g10/gpg.c:3456
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3455
++#: g10/gpg.c:3459
  msgid "invalid auto-key-locate list\n"
  msgstr "無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3602 sm/gpgsm.c:1501
++#: g10/gpg.c:3606 sm/gpgsm.c:1501
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告: 程式可能會傾印出核心檔!\n"
  
- #: g10/gpg.c:3613
++#: g10/gpg.c:3617
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告: %s 會推翻 %s\n"
  
- #: g10/gpg.c:3622
++#: g10/gpg.c:3626
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不允許跟 %s 併用!\n"
  
- #: g10/gpg.c:3625
++#: g10/gpg.c:3629
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 跟 %s 放在一起沒有意義!\n"
  
- #: g10/gpg.c:3640 sm/gpgsm.c:1518 dirmngr/dirmngr.c:948
++#: g10/gpg.c:3644 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1023
  msgid "WARNING: running with faked system time: "
  msgstr "警告: 正在偽造的系統時間中執行: "
  
- #: g10/gpg.c:3661
++#: g10/gpg.c:3665
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
  
- #: g10/gpg.c:3696 g10/gpg.c:3720 sm/gpgsm.c:1585
++#: g10/gpg.c:3700 g10/gpg.c:3724 sm/gpgsm.c:1585
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所選的編密演算法無效\n"
  
- #: g10/gpg.c:3702 g10/gpg.c:3726 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3706 g10/gpg.c:3730 sm/gpgsm.c:1591 sm/gpgsm.c:1597
  msgid "selected digest algorithm is invalid\n"
  msgstr "所選的摘要演算法無效\n"
  
- #: g10/gpg.c:3708
++#: g10/gpg.c:3712
  msgid "selected compression algorithm is invalid\n"
  msgstr "所選的壓縮演算法無效\n"
  
- #: g10/gpg.c:3714
++#: g10/gpg.c:3718
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所選的憑證摘要演算法無效\n"
  
- #: g10/gpg.c:3729
++#: g10/gpg.c:3733
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed 一定要大於 0\n"
  
- #: g10/gpg.c:3731
++#: g10/gpg.c:3735
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed 一定要大於 1\n"
  
- #: g10/gpg.c:3733
++#: g10/gpg.c:3737
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
  
- #: g10/gpg.c:3735
++#: g10/gpg.c:3739
  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:3737
++#: g10/gpg.c:3741
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
  
- #: g10/gpg.c:3740
++#: g10/gpg.c:3744
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
  
- #: g10/gpg.c:3744
++#: g10/gpg.c:3748
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
  
- #: g10/gpg.c:3751
++#: g10/gpg.c:3755
  msgid "invalid default preferences\n"
  msgstr "無效的預設偏好\n"
  
- #: g10/gpg.c:3755
++#: g10/gpg.c:3759
  msgid "invalid personal cipher preferences\n"
  msgstr "無效的個人編密法偏好\n"
  
- #: g10/gpg.c:3759
++#: g10/gpg.c:3763
  msgid "invalid personal digest preferences\n"
  msgstr "無效的個人摘要偏好\n"
  
- #: g10/gpg.c:3763
++#: g10/gpg.c:3767
  msgid "invalid personal compress preferences\n"
  msgstr "無效的個人壓縮偏好\n"
  
- #: g10/gpg.c:3799
++#: g10/gpg.c:3803
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 還沒辦法跟 %s 一起運作\n"
  
- #: g10/gpg.c:3846
++#: g10/gpg.c:3850
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3851
++#: g10/gpg.c:3855
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3856
++#: g10/gpg.c:3860
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:3959
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信任資料庫啟始失敗: %s\n"
  
- #: g10/gpg.c:3967
++#: g10/gpg.c:3971
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
  
- #: g10/gpg.c:4038
++#: g10/gpg.c:4042
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s' 對稱式加密失敗: %s\n"
  
- #: g10/gpg.c:4067
++#: g10/gpg.c:4071
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:4070
++#: g10/gpg.c:4074
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:4127
++#: g10/gpg.c:4131
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4130
++#: g10/gpg.c:4134
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4472 g10/keyserver.c:1837
++#: g10/gpg.c:4476 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "送至金鑰伺服器失敗: %s\n"
  
- #: g10/gpg.c:4477
++#: g10/gpg.c:4481
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "從金鑰伺服器接收失敗: %s\n"
  
- #: g10/gpg.c:4483
++#: g10/gpg.c:4487
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4496
++#: g10/gpg.c:4500
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4508
++#: g10/gpg.c:4512
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "用金鑰伺服器搜尋失敗: %s\n"
  
- #: g10/gpg.c:4521
++#: g10/gpg.c:4525
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "從金鑰伺服器更新失敗: %s\n"
  
- #: g10/gpg.c:4588
++#: g10/gpg.c:4592
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解開封裝失敗: %s\n"
  
- #: g10/gpg.c:4599
++#: g10/gpg.c:4603
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "進行封裝失敗: %s\n"
  
- #: g10/gpg.c:4691
++#: g10/gpg.c:4695
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無效的雜湊演算法 '%s'\n"
  
- #: g10/gpg.c:4837 g10/tofu.c:2151
++#: g10/gpg.c:4841 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:4849
++#: g10/gpg.c:4853
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4904
++#: g10/gpg.c:4901
+ msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
+ msgstr ""
+ 
++#: g10/gpg.c:4912
  msgid "Go ahead and type your message ...\n"
  msgstr "請開始輸入你的訊息 ...\n"
  
- #: g10/gpg.c:5242
++#: g10/gpg.c:5250
  msgid "the given certification policy URL is invalid\n"
  msgstr "給定的的憑證原則 URL 無效\n"
  
- #: g10/gpg.c:5244
++#: g10/gpg.c:5252
  msgid "the given signature policy URL is invalid\n"
  msgstr "給定的簽章原則 URL 無效\n"
  
- #: g10/gpg.c:5277
++#: g10/gpg.c:5285
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "給定的偏好金鑰伺服器 URL 無效\n"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:79
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
  
- #: g10/gpgv.c:80
++#: g10/gpgv.c:82
  msgid "make timestamp conflicts only a warning"
  msgstr "僅把時間戳印矛盾視為警告"
  
- #: g10/gpgv.c:82 sm/gpgsm.c:347
++#: g10/gpgv.c:84 sm/gpgsm.c:347
  msgid "|FD|write status info to this FD"
  msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
  
- #: g10/gpgv.c:86
++#: g10/gpgv.c:89
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:124
++#: g10/gpgv.c:148
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
  
- #: g10/gpgv.c:126
++#: g10/gpgv.c:150
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -4353,14 -3402,9 +4370,14 @@@ msgstr "
  "請注意顯示出來的金鑰有效性不需要更正,\n"
  "除非你重新執行程式.\n"
  
 +#: 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:717
- #: dirmngr/ocsp.c:703
++#: g10/mainproc.c:2075 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: dirmngr/ocsp.c:704
  msgid "revoked"
  msgstr "已撤銷"
  
 +#: 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:719
++#: g10/mainproc.c:2077 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
  msgid "expired"
  msgstr "已過期"
  
@@@ -4397,7 -3435,6 +4414,7 @@@ msgstr "你確定仍然想要增加嗎
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
  
- #: g10/keyedit.c:4407 g10/keygen.c:2721
++#: g10/keyedit.c:4407 g10/keygen.c:2706
  msgid "Such a user ID already exists on this key!\n"
  msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
  
@@@ -4428,7 -3459,6 +4445,7 @@@ msgstr[0] "已經刪除了 %d 份簽章
  msgid "Nothing deleted.\n"
  msgstr "沒有刪除任何東西.\n"
  
- #: g10/keyedit.c:4585 g10/trust.c:721
++#: g10/keyedit.c:4585 g10/trust.c:731
  msgid "invalid"
  msgstr "無效"
  
@@@ -4663,69 -3645,53 +4680,69 @@@ msgstr "子鑰 %s 已撤銷.\n
  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:316
++#: g10/keygen.c:317
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "偏好設定 '%s' 重複了\n"
  
- #: g10/keygen.c:323
++#: g10/keygen.c:324
  msgid "too many cipher preferences\n"
  msgstr "編密偏好過多\n"
  
- #: g10/keygen.c:325
++#: g10/keygen.c:326
  msgid "too many digest preferences\n"
  msgstr "摘要偏好過多\n"
  
- #: g10/keygen.c:327
++#: g10/keygen.c:328
  msgid "too many compression preferences\n"
  msgstr "壓縮偏好過多\n"
  
- #: g10/keygen.c:470
++#: g10/keygen.c:471
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "偏好字串中含有無效的項目 '%s'\n"
  
- #: g10/keygen.c:949
++#: g10/keygen.c:950
  msgid "writing direct signature\n"
  msgstr "寫入直接簽章中\n"
  
- #: g10/keygen.c:995
++#: g10/keygen.c:996
  msgid "writing self signature\n"
  msgstr "寫入自我簽章中\n"
  
- #: g10/keygen.c:1051
++#: g10/keygen.c:1052
  msgid "writing key binding signature\n"
  msgstr "寫入附鑰簽章中\n"
  
- #: g10/keygen.c:1415 g10/keygen.c:1420 g10/keygen.c:1472 g10/keygen.c:1477
- #: g10/keygen.c:1624 g10/keygen.c:1629
++#: g10/keygen.c:1416 g10/keygen.c:1421 g10/keygen.c:1473 g10/keygen.c:1478
++#: g10/keygen.c:1625 g10/keygen.c:1630
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "金鑰尺寸無效; 改用 %u 位元\n"
  
- #: g10/keygen.c:1426 g10/keygen.c:1483 g10/keygen.c:1491 g10/keygen.c:1635
++#: g10/keygen.c:1427 g10/keygen.c:1484 g10/keygen.c:1492 g10/keygen.c:1636
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "金鑰尺寸增大到 %u 位元\n"
  
- #: g10/keygen.c:1517
++#: g10/keygen.c:1518
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
  
- #: g10/keygen.c:1691
++#: g10/keygen.c:1692
  msgid "Sign"
  msgstr "簽署"
  
- #: g10/keygen.c:1694
++#: g10/keygen.c:1695
  msgid "Certify"
  msgstr "保證"
  
- #: g10/keygen.c:1697
++#: g10/keygen.c:1698
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1700
++#: g10/keygen.c:1701
  msgid "Authenticate"
  msgstr "鑑定"
  
@@@ -4739,150 -3705,119 +4756,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1719
++#: g10/keygen.c:1720
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1746
++#: g10/keygen.c:1747
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 金鑰可能的動作: "
  
- #: g10/keygen.c:1752
++#: g10/keygen.c:1753
  msgid "Current allowed actions: "
  msgstr "目前可進行的動作: "
  
- #: g10/keygen.c:1757
++#: g10/keygen.c:1758
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 切換簽署性能\n"
  
- #: g10/keygen.c:1760
++#: g10/keygen.c:1761
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 切換加密性能\n"
  
- #: g10/keygen.c:1763
++#: g10/keygen.c:1764
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 切換鑑定性能\n"
  
- #: g10/keygen.c:1766
++#: g10/keygen.c:1767
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1895 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1880 sm/certreqgen-ui.c:157
  msgid "Please select what kind of key you want:\n"
  msgstr "請選擇你要使用的金鑰種類:\n"
  
- #: g10/keygen.c:1899
++#: g10/keygen.c:1884
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA 和 RSA (預設)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1888
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 Elgamal\n"
  
- #: g10/keygen.c:1906
++#: g10/keygen.c:1891
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1908
++#: g10/keygen.c:1893
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1914
++#: g10/keygen.c:1899
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (僅能用於加密)\n"
  
- #: g10/keygen.c:1916
++#: g10/keygen.c:1901
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (僅能用於加密)\n"
  
- #: g10/keygen.c:1922
++#: g10/keygen.c:1907
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1924
++#: g10/keygen.c:1909
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1930
++#: g10/keygen.c:1915
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC 和 ECC\n"
  
- #: g10/keygen.c:1932
++#: g10/keygen.c:1917
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) ECC (僅能用於簽署)\n"
  
- #: g10/keygen.c:1934
++#: g10/keygen.c:1919
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) ECC (你能自己設定性能)\n"
  
- #: g10/keygen.c:1936
++#: g10/keygen.c:1921
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) ECC (僅能用於加密)\n"
  
- #: g10/keygen.c:1940
++#: g10/keygen.c:1925
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) 現有的金鑰\n"
  
- #: g10/keygen.c:2036 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2021 sm/certreqgen-ui.c:202
  msgid "Enter the keygrip: "
  msgstr "請輸入金鑰鑰柄: "
  
- #: g10/keygen.c:2049 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2034 sm/certreqgen-ui.c:210
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
  
- #: g10/keygen.c:2051 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2036 sm/certreqgen-ui.c:212
  msgid "No key with this keygrip\n"
  msgstr "沒有金鑰有此金鑰鑰柄\n"
  
- #: g10/keygen.c:2135 g10/keygen.c:2149
++#: g10/keygen.c:2120 g10/keygen.c:2134
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/keygen.c:2190
++#: g10/keygen.c:2175
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
  
- #: g10/keygen.c:2198
++#: g10/keygen.c:2183
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2201 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2186 sm/certreqgen-ui.c:179
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "你想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2215 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2200 sm/certreqgen-ui.c:189
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "你所要求的金鑰尺寸是 %u 位元\n"
  
- #: g10/keygen.c:2261
++#: g10/keygen.c:2246
  msgid "Please select which elliptic curve you want:\n"
  msgstr "請選擇你要使用的橢圓曲線:\n"
  
- #: g10/keygen.c:2433
++#: g10/keygen.c:2418
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4898,7 -3833,6 +4915,7 @@@ msgstr "
  "      <n>m = 金鑰在 n 月後會到期\n"
  "      <n>y = 金鑰在 n 年後會到期\n"
  
- #: g10/keygen.c:2444
++#: g10/keygen.c:2429
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4914,38 -3848,30 +4931,38 @@@ msgstr "
  "      <n>m = 簽章在 n 月後會到期\n"
  "      <n>y = 簽章在 n 年後會到期\n"
  
- #: g10/keygen.c:2467
++#: g10/keygen.c:2452
  msgid "Key is valid for? (0) "
  msgstr "金鑰的有效期限是多久? (0) "
  
- #: g10/keygen.c:2472
++#: g10/keygen.c:2457
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "簽章的有效期限是多久? (%s) "
  
- #: g10/keygen.c:2485 g10/keygen.c:2510
++#: g10/keygen.c:2470 g10/keygen.c:2495
  msgid "invalid value\n"
  msgstr "無效的數值\n"
  
- #: g10/keygen.c:2492
++#: g10/keygen.c:2477
  msgid "Key does not expire at all\n"
  msgstr "金鑰完全不會過期\n"
  
- #: g10/keygen.c:2493
++#: g10/keygen.c:2478
  msgid "Signature does not expire at all\n"
  msgstr "簽章完全不會過期\n"
  
- #: g10/keygen.c:2498
++#: g10/keygen.c:2483
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "金鑰將會在 %s 到期\n"
  
- #: g10/keygen.c:2499
++#: g10/keygen.c:2484
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "簽章將會在 %s 到期.\n"
  
- #: g10/keygen.c:2503
++#: g10/keygen.c:2488
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4953,11 -3879,9 +4970,11 @@@ msgstr "
  "你的系統無法顯示 2038 年以後的日期.\n"
  "不過, 它可以正確處理直到 2106 年之前的年份.\n"
  
- #: g10/keygen.c:2516
++#: g10/keygen.c:2501
  msgid "Is this correct? (y/N) "
  msgstr "以上正確嗎? (y/N) "
  
- #: g10/keygen.c:2584
++#: g10/keygen.c:2569
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4971,7 -3895,6 +4988,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:2599
++#: g10/keygen.c:2584
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4986,49 -3909,38 +5003,49 @@@ msgstr "
  "    \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
  "\n"
  
- #: g10/keygen.c:2618
++#: g10/keygen.c:2603
  msgid "Real name: "
  msgstr "真實姓名: "
  
- #: g10/keygen.c:2627
++#: g10/keygen.c:2612
  msgid "Invalid character in name\n"
  msgstr "姓名含有無效的字符\n"
  
- #: g10/keygen.c:2628
++#: g10/keygen.c:2613
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2632
++#: g10/keygen.c:2617
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用數字開頭\n"
  
- #: g10/keygen.c:2635
++#: g10/keygen.c:2620
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五個字符長\n"
  
- #: g10/keygen.c:2645
++#: g10/keygen.c:2630
  msgid "Email address: "
  msgstr "電子郵件地址: "
  
- #: g10/keygen.c:2651
++#: g10/keygen.c:2636
  msgid "Not a valid email address\n"
  msgstr "不是有效的電子郵件地址\n"
  
- #: g10/keygen.c:2660
++#: g10/keygen.c:2645
  msgid "Comment: "
  msgstr "註釋: "
  
- #: g10/keygen.c:2666
++#: g10/keygen.c:2651
  msgid "Invalid character in comment\n"
  msgstr "註釋含有無效的字符\n"
  
- #: g10/keygen.c:2702
++#: g10/keygen.c:2687
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "你正在使用 '%s' 字元集.\n"
  
- #: g10/keygen.c:2708
++#: g10/keygen.c:2693
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5039,7 -3951,6 +5056,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2713
++#: g10/keygen.c:2698
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
  
@@@ -5054,31 -3965,24 +5071,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2738
++#: g10/keygen.c:2723
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2748
++#: g10/keygen.c:2733
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2749
++#: g10/keygen.c:2734
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2754
++#: g10/keygen.c:2739
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2755
++#: g10/keygen.c:2740
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2774
++#: g10/keygen.c:2759
  msgid "Please correct the error first\n"
  msgstr "請先訂正錯誤\n"
  
- #: g10/keygen.c:2820
++#: g10/keygen.c:2805
  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"
@@@ -5089,13 -3993,10 +5106,13 @@@ msgstr "
  "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
  "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
  
- #: g10/keygen.c:3915 g10/keygen.c:3982 g10/keygen.c:3999 g10/keygen.c:4022
- #: g10/keygen.c:4332 g10/keygen.c:4805 g10/keygen.c:5066 g10/keygen.c:5171
++#: g10/keygen.c:3901 g10/keygen.c:3968 g10/keygen.c:3985 g10/keygen.c:4008
++#: g10/keygen.c:4347 g10/keygen.c:4829 g10/keygen.c:5090 g10/keygen.c:5195
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "產生金鑰失敗: %s\n"
  
- #: g10/keygen.c:3924
++#: g10/keygen.c:3910
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5106,62 -4007,49 +5123,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3926
++#: g10/keygen.c:3912
  msgid "Continue? (Y/n) "
  msgstr "是否繼續? (Y/n) "
  
- #: g10/keygen.c:3947
++#: g10/keygen.c:3933
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" 的金鑰已存在\n"
  
- #: g10/keygen.c:3952
++#: g10/keygen.c:3938
  msgid "Create anyway? (y/N) "
  msgstr "無論如何還是要建立嗎? (y/N) "
  
- #: g10/keygen.c:3958
++#: g10/keygen.c:3944
  msgid "creating anyway\n"
  msgstr "總之還是在建立\n"
  
- #: g10/keygen.c:4317
++#: g10/keygen.c:4332
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
  
- #: g10/keygen.c:4360
++#: g10/keygen.c:4375
  msgid "Key generation canceled.\n"
  msgstr "金鑰產生已取消.\n"
  
- #: g10/keygen.c:4420
++#: g10/keygen.c:4435
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "無法建立備份檔案 '%s': %s\n"
  
- #: g10/keygen.c:4440
++#: g10/keygen.c:4455
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
  
- #: g10/keygen.c:4591 g10/keygen.c:4740
++#: g10/keygen.c:4609 g10/keygen.c:4764
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "正在寫入公鑰至 '%s'\n"
  
- #: g10/keygen.c:4734
++#: g10/keygen.c:4758
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
  
- #: g10/keygen.c:4748
++#: g10/keygen.c:4772
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/keygen.c:4780
++#: g10/keygen.c:4804
  msgid "public and secret key created and signed.\n"
  msgstr "公鑰和私鑰已建立及簽署.\n"
  
- #: g10/keygen.c:4792
++#: g10/keygen.c:4816
  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"
@@@ -5169,31 -4057,25 +5186,31 @@@ msgstr "
  "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
  "來產生加密用的子鑰.\n"
  
- #: g10/keygen.c:4938 g10/keygen.c:5122
++#: g10/keygen.c:4962 g10/keygen.c:5146
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4940 g10/keygen.c:5124
++#: g10/keygen.c:4964 g10/keygen.c:5148
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4951 g10/keygen.c:5135
++#: g10/keygen.c:4975 g10/keygen.c:5159
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
  
- #: g10/keygen.c:4963 g10/keygen.c:4965
++#: g10/keygen.c:4987 g10/keygen.c:4989
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鑰的私鑰部分無法取用.\n"
  
- #: g10/keygen.c:4972 g10/keygen.c:4974
++#: g10/keygen.c:4996 g10/keygen.c:4998
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鑰的私鑰部分存放於卡上.\n"
  
- #: g10/keygen.c:4993 g10/keygen.c:5149
++#: g10/keygen.c:5017 g10/keygen.c:5173
  msgid "Really create? (y/N) "
  msgstr "真的要建立嗎? (y/N) "
  
@@@ -5273,33 -4139,28 +5290,33 @@@ msgstr "      金鑰指紋 =
  msgid "      Card serial no. ="
  msgstr "      卡片序號 ="
  
- #: g10/keyring.c:1498
++#: g10/keyring.c:1512
  #, c-format
  msgid "caching keyring '%s'\n"
  msgstr "快取鑰匙圈 '%s' 中\n"
  
- #: g10/keyring.c:1572
++#: g10/keyring.c:1586
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
  msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
  
- #: g10/keyring.c:1588
++#: g10/keyring.c:1602
  #, fuzzy, c-format
  #| msgid "flush the cache"
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
  msgstr[0] "清除快取"
  
- #: g10/keyring.c:1590
++#: g10/keyring.c:1604
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
  msgstr[0] "1 份損壞的簽章\n"
  
- #: g10/keyring.c:1665
++#: g10/keyring.c:1679
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: 鑰匙圈已建立\n"
@@@ -5592,7 -4391,6 +5609,7 @@@ msgstr "二進制
  msgid "textmode"
  msgstr "文字模式"
  
- #: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2167 g10/trust.c:103 dirmngr/ocsp.c:705
  msgid "unknown"
  msgstr "未知"
  
@@@ -5799,49 -4555,38 +5816,49 @@@ msgstr "警告: 可能並不安全的�
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "%d 類別的子封包設定了關鍵位元\n"
  
- #: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
++#: g10/passphrase.c:73 g10/passphrase.c:261 g10/passphrase.c:294
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "代理程式的問題: %s\n"
  
- #: g10/passphrase.c:241
++#: g10/passphrase.c:244
  msgid "Enter passphrase\n"
  msgstr "請輸入密語\n"
  
- #: g10/passphrase.c:252
++#: g10/passphrase.c:255
  msgid "cancelled by user\n"
  msgstr "由使用者所取消\n"
  
- #: g10/passphrase.c:489
++#: g10/passphrase.c:492
  #, c-format
  msgid " (main key ID %s)"
  msgstr " (主要金鑰 ID %s)"
  
- #: g10/passphrase.c:496
++#: g10/passphrase.c:499
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
  
- #: g10/passphrase.c:500
++#: g10/passphrase.c:503
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
  
- #: g10/passphrase.c:505
++#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
  
- #: g10/passphrase.c:508
++#: g10/passphrase.c:511
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
  
- #: g10/passphrase.c:513
++#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
  
- #: g10/passphrase.c:516
++#: g10/passphrase.c:519
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
  
- #: g10/passphrase.c:525
++#: g10/passphrase.c:528
  #, c-format
  msgid ""
  "%s\n"
@@@ -6267,17 -4929,14 +6284,17 @@@ msgstr "不支援舊式的 DEK 編碼\n
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "%d%s 編密演算法未知或已停用\n"
  
- #: g10/pubkey-enc.c:352
++#: g10/pubkey-enc.c:354
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
  
- #: g10/pubkey-enc.c:377
++#: g10/pubkey-enc.c:387
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
  
- #: g10/pubkey-enc.c:384
++#: g10/pubkey-enc.c:394
  msgid "Note: key has been revoked"
  msgstr "請注意: 金鑰已撤銷"
  
@@@ -6573,17 -5183,14 +6590,17 @@@ msgstr "警告: 偏好金鑰伺服器 U
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s/%s 簽章來自: \"%s\"\n"
  
- #: g10/sign.c:880
++#: g10/sign.c:887
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
  
- #: g10/sign.c:1011
++#: g10/sign.c:1018
  msgid "signing:"
  msgstr "簽署:"
  
- #: g10/sign.c:1288
++#: g10/sign.c:1295
  #, c-format
  msgid "%s encryption will be used\n"
  msgstr "%s 加密將被採用\n"
@@@ -6640,17 -5236,14 +6657,17 @@@ msgstr "無效的指紋
  msgid "ownertrust value missing"
  msgstr "主觀信任值缺漏"
  
- #: g10/tdbdump.c:217
++#: g10/tdbdump.c:221
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
  
- #: g10/tdbdump.c:221
++#: g10/tdbdump.c:225
  #, c-format
  msgid "read error in '%s': %s\n"
  msgstr "'%s' 讀取錯誤: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:384
++#: g10/tdbdump.c:234 g10/trustdb.c:384
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任資料庫: 同步化失敗: %s\n"
@@@ -6684,7 -5271,6 +6701,7 @@@ msgstr "信任資料庫更動量過大\
  msgid "%s: directory does not exist!\n"
  msgstr "%s: 目錄不存在!\n"
  
- #: g10/tdbio.c:703 dirmngr/http.c:517
++#: g10/tdbio.c:703 dirmngr/http.c:583
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "無法存取 '%s': %s\n"
@@@ -6825,10 -5383,6 +6842,10 @@@ msgstr "建立暫存檔時出錯: %s\n
  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
++#: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2344 g10/tofu.c:2363
++#: g10/tofu.c:2376 g10/tofu.c:2388 g10/tofu.c:2403 g10/tofu.c:2415
++#: g10/tofu.c:2994 g10/tofu.c:3011 g10/tofu.c:3048 g10/tofu.c:3065
++#: g10/tofu.c:3369
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
@@@ -6863,7 -5412,6 +6880,7 @@@ msgstr "
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
  
- #: g10/tofu.c:1149 g10/tofu.c:3407 g10/tofu.c:3521
++#: g10/tofu.c:1149 g10/tofu.c:3423 g10/tofu.c:3561
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
@@@ -7030,11 -5551,9 +7047,11 @@@ msgstr "
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
 +#: g10/tofu.c:1972
- msgid "Defaulting to unknown."
+ msgid "Defaulting to unknown.\n"
  msgstr ""
  
 +#: g10/tofu.c:2087 g10/tofu.c:2223
  msgid "TOFU db corruption detected.\n"
  msgstr ""
  
@@@ -7044,116 -5562,96 +7061,116 @@@
  msgid "resetting keydb: %s\n"
  msgstr "寫入金鑰時出錯: %s\n"
  
- #: g10/tofu.c:2601
++#: g10/tofu.c:2605
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
  msgid "error setting TOFU binding's policy to %s\n"
  msgstr "設定 OCSP 目標時出錯: %s\n"
  
- #: g10/tofu.c:2794
++#: g10/tofu.c:2801
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
  msgstr "建立管道時出錯: %s\n"
  
- #: g10/tofu.c:2839
++#: g10/tofu.c:2852
  #, c-format
  msgid "%lld~year"
  msgid_plural "%lld~years"
  msgstr[0] ""
  
- #: g10/tofu.c:2844
++#: g10/tofu.c:2857
  #, c-format
  msgid "%lld~month"
  msgid_plural "%lld~months"
  msgstr[0] ""
  
- #: g10/tofu.c:2849
++#: g10/tofu.c:2862
  #, c-format
  msgid "%lld~week"
  msgid_plural "%lld~weeks"
  msgstr[0] ""
  
- #: g10/tofu.c:2854
++#: g10/tofu.c:2867
  #, c-format
  msgid "%lld~day"
  msgid_plural "%lld~days"
  msgstr[0] ""
  
- #: g10/tofu.c:2859
++#: g10/tofu.c:2872
  #, c-format
  msgid "%lld~hour"
  msgid_plural "%lld~hours"
  msgstr[0] ""
  
- #: g10/tofu.c:2864
++#: g10/tofu.c:2877
  #, c-format
  msgid "%lld~minute"
  msgid_plural "%lld~minutes"
  msgstr[0] ""
  
- #: g10/tofu.c:2866
++#: g10/tofu.c:2879
  #, c-format
  msgid "%lld~second"
  msgid_plural "%lld~seconds"
  msgstr[0] ""
  
- #: g10/tofu.c:3103
++#: g10/tofu.c:3118
  #, c-format
  msgid "%s: Verified 0~signatures and encrypted 0~messages."
  msgstr ""
  
- #: g10/tofu.c:3109
++#: g10/tofu.c:3124
  #, fuzzy, c-format
  #| msgid "Deleted %d signatures.\n"
  msgid "%s: Verified 0 signatures."
  msgstr "已經刪除了 %d 份簽章.\n"
  
- #: g10/tofu.c:3117
++#: g10/tofu.c:3132
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "%s: Verified %ld~signature in the past %s."
  msgid_plural "%s: Verified %ld~signatures in the past %s."
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:3127
++#: g10/tofu.c:3142
  #, fuzzy
  #| msgid "encrypted with %lu passphrases\n"
  msgid "Encrypted 0 messages."
  msgstr "已用 %lu 個密語加密了\n"
  
- #: g10/tofu.c:3135
++#: g10/tofu.c:3150
  #, fuzzy, c-format
  #| msgid "print message digests"
  msgid "Encrypted %ld~message in the past %s."
  msgid_plural "Encrypted %ld~messages in the past %s."
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:3146
++#: g10/tofu.c:3161
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "(policy: %s)"
  msgstr "有效性: %s"
  
- #: g10/tofu.c:3177
++#: g10/tofu.c:3192
  msgid ""
  "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3180
++#: g10/tofu.c:3195
  msgid ""
  "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:3184
++#: g10/tofu.c:3199
  msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3187
++#: g10/tofu.c:3202
  msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:3216
++#: g10/tofu.c:3231
  #, c-format
  msgid ""
  "Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7169,19 -5667,15 +7186,19 @@@ msgid_plural "
  "to mark it as being bad.\n"
  msgstr[0] ""
  
- #: 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
++#: g10/tofu.c:3313 g10/tofu.c:3465 g10/tofu.c:3667 g10/tofu.c:3711
++#: g10/tofu.c:3850 g10/tofu.c:3925 g10/tofu.c:3960
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:3482
++#: g10/tofu.c:3498
  #, c-format
- msgid "WARNING: Encrypting to %s, which has no non-revoked user ids.\n"
+ msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
  msgstr ""
  
- #: g10/tofu.c:3819
++#: g10/tofu.c:3885
  #, fuzzy, c-format
  #| msgid "error writing public keyring '%s': %s\n"
  msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7230,78 -5715,63 +7247,78 @@@ msgstr "你可以試著用下列指令�
  msgid "If that does not work, please consult the manual\n"
  msgstr "如果行不通的話, 請查閱手冊\n"
  
- #: g10/trustdb.c:475
++#: g10/trustdb.c:488
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
  
- #: g10/trustdb.c:481
++#: g10/trustdb.c:494
  #, c-format
  msgid "using %s trust model\n"
  msgstr "正在使用 %s 信任模型\n"
  
- #: g10/trustdb.c:518
++#: g10/trustdb.c:533
  msgid "no need for a trustdb check\n"
  msgstr "不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:524 g10/trustdb.c:2187
++#: g10/trustdb.c:539 g10/trustdb.c:2218
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任資料庫檢查將於 %s 進行\n"
  
- #: g10/trustdb.c:533
++#: g10/trustdb.c:548
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:549
++#: g10/trustdb.c:564
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
  
- #: g10/trustdb.c:756 g10/trustdb.c:1340
++#: g10/trustdb.c:787 g10/trustdb.c:1371
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公鑰 %s: %s\n"
  
- #: g10/trustdb.c:973
++#: g10/trustdb.c:1004
  msgid "please do a --check-trustdb\n"
  msgstr "請做一次 --check-trustdb\n"
  
- #: g10/trustdb.c:978
++#: g10/trustdb.c:1009
  msgid "checking the trustdb\n"
  msgstr "正在檢查信任資料庫\n"
  
- #: g10/trustdb.c:1910
++#: g10/trustdb.c:1941
  #, 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:1913
++#: g10/trustdb.c:1944
  #, 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:1983
++#: g10/trustdb.c:2014
  msgid "no ultimately trusted keys found\n"
  msgstr "沒有找到任何徹底信任的金鑰\n"
  
- #: g10/trustdb.c:1997
++#: g10/trustdb.c:2028
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
  
- #: g10/trustdb.c:2114
++#: g10/trustdb.c:2145
  #, 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:2194
++#: g10/trustdb.c:2225
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -7420,19 -5869,14 +7437,19 @@@ msgstr "
  "語法: kbxutil [選項] [檔案]\n"
  "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
  
- #: scd/app-nks.c:718 scd/app-openpgp.c:3212
++#: scd/app-nks.c:718 scd/app-openpgp.c:3367
  #, 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:3224
++#: scd/app-nks.c:726 scd/app-openpgp.c:3379
  #, 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:1956 scd/app-openpgp.c:1975
- #: scd/app-openpgp.c:2140 scd/app-openpgp.c:2157 scd/app-openpgp.c:2421
- #: scd/app-openpgp.c:2468 scd/app-openpgp.c:2573 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:2123 scd/app-openpgp.c:2142
++#: scd/app-openpgp.c:2295 scd/app-openpgp.c:2312 scd/app-openpgp.c:2576
++#: scd/app-openpgp.c:2623 scd/app-openpgp.c:2728 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@@ -7477,7 -5912,6 +7494,7 @@@ msgid "
  "qualified signatures."
  msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
  
- #: scd/app-nks.c:1233 scd/app-openpgp.c:2502 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2657 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
@@@ -7492,68 -5924,68 +7509,85 @@@ msgstr "存放指紋失敗: %s\n
  msgid "failed to store the creation date: %s\n"
  msgstr "存放創生日期失敗: %s\n"
  
- #: scd/app-openpgp.c:1238
++#: scd/app-openpgp.c:1173 scd/app-openpgp.c:2604 scd/app-openpgp.c:4714
+ msgid "error retrieving CHV status from card\n"
+ msgstr "從卡片取回 CHV 狀態時出錯\n"
+ 
++#: scd/app-openpgp.c:1336
  msgid "response does not contain the RSA modulus\n"
  msgstr "回應中未包含 RSA 系數\n"
  
- #: scd/app-openpgp.c:1245
++#: scd/app-openpgp.c:1343
  msgid "response does not contain the RSA public exponent\n"
  msgstr "回應中未包含 RSA 公用指數\n"
  
- #: scd/app-openpgp.c:1355
++#: scd/app-openpgp.c:1453
  #, 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:1455 scd/app-openpgp.c:3828
++#: scd/app-openpgp.c:1553 scd/app-openpgp.c:3983
  msgid "response does not contain the public key data\n"
  msgstr "回應中未包含公鑰資料\n"
  
- #: scd/app-openpgp.c:1555
++#: scd/app-openpgp.c:1653
  #, c-format
  msgid "reading public key failed: %s\n"
  msgstr "讀取公鑰時失敗: %s\n"
  
- #: scd/app-openpgp.c:1907
+ #. TRANSLATORS: Put a \x1f right before a colon.  This can be
+ #. * used by pinentry to nicely align the names and values.  Keep
+ #. * the %s at the start and end of the string.
++#: scd/app-openpgp.c:1992
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2005
+ #, c-format
+ msgid "%sNumber: %s%%0AHolder: %s%s"
+ msgstr ""
+ 
+ #. TRANSLATORS: This is the number of remaining attempts to
+ #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
++#: scd/app-openpgp.c:2021
+ #, c-format
+ msgid "Remaining attempts: %d"
+ msgstr ""
+ 
++#: scd/app-openpgp.c:2077
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "以 %s 做為預設 PIN\n"
  
- #: scd/app-openpgp.c:1914
++#: scd/app-openpgp.c:2084
  #, 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:1929
- #, c-format
- msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
- 
- #: scd/app-openpgp.c:1940 scd/app-openpgp.c:2415
- msgid "||Please enter the PIN"
++#: scd/app-openpgp.c:2097
+ #, fuzzy
+ #| msgid "||Please enter the PIN"
+ msgid "||Please unlock the card"
  msgstr "||請輸入個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:1982 scd/app-openpgp.c:2164 scd/app-openpgp.c:2428
++#: scd/app-openpgp.c:2149 scd/app-openpgp.c:2319 scd/app-openpgp.c:2583
  #, 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:1995 scd/app-openpgp.c:2034 scd/app-openpgp.c:2176
- #: scd/app-openpgp.c:4129
++#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2201 scd/app-openpgp.c:2331
++#: scd/app-openpgp.c:4284
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "驗證 CHV%d 失敗: %s\n"
  
- #: scd/app-openpgp.c:2063 scd/app-openpgp.c:2449 scd/app-openpgp.c:4559
- msgid "error retrieving CHV status from card\n"
- msgstr "從卡片取回 CHV 狀態時出錯\n"
- 
- #: scd/app-openpgp.c:2069 scd/app-openpgp.c:4568
++#: scd/app-openpgp.c:2230 scd/app-openpgp.c:4723
  msgid "card is permanently locked!\n"
  msgstr "卡片永久鎖定了!!\n"
  
- #: scd/app-openpgp.c:2076
++#: scd/app-openpgp.c:2234
  #, 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"
@@@ -7562,25 -5994,19 +7596,24 @@@ msgid_plural "
  msgstr[0] "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\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:2086
- #, c-format
- msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "|A|請在上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
- 
- #: scd/app-openpgp.c:2090
+ #. the start of the string.  Use %0A (single percent) for a linefeed.
++#: scd/app-openpgp.c:2244
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|請輸入管理者 PIN"
  
- #: scd/app-openpgp.c:2111
++#: scd/app-openpgp.c:2266
  msgid "access to admin commands is not configured\n"
  msgstr "管理者指令存取權限尚未組態\n"
  
- #: scd/app-openpgp.c:2464
++#: scd/app-openpgp.c:2570
+ msgid "||Please enter the PIN"
+ msgstr "||請輸入個人識別碼 (PIN)"
+ 
++#: scd/app-openpgp.c:2619
  msgid "||Please enter the Reset Code for the card"
  msgstr "||請輸入卡片的重設碼"
  
- #: scd/app-openpgp.c:2474 scd/app-openpgp.c:2528
++#: scd/app-openpgp.c:2629 scd/app-openpgp.c:2683
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "重設碼太短; 長度最少要有 %d\n"
@@@ -7588,109 -6014,85 +7621,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:2497
++#: scd/app-openpgp.c:2652
  msgid "|RN|New Reset Code"
  msgstr "|RN|新增重設碼"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新增管理者個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2498
++#: scd/app-openpgp.c:2653
  msgid "|N|New PIN"
  msgstr "|N|新增個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2569
++#: scd/app-openpgp.c:2724
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
  
- #: scd/app-openpgp.c:2570
++#: scd/app-openpgp.c:2725
  msgid "||Please enter the PIN and New PIN"
  msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2626 scd/app-openpgp.c:3888
++#: scd/app-openpgp.c:2781 scd/app-openpgp.c:4043
  msgid "error reading application data\n"
  msgstr "讀取應用程式資料時出錯\n"
  
- #: scd/app-openpgp.c:2632 scd/app-openpgp.c:3895
++#: scd/app-openpgp.c:2787 scd/app-openpgp.c:4050
  msgid "error reading fingerprint DO\n"
  msgstr "讀取指紋 DO 時出錯\n"
  
- #: scd/app-openpgp.c:2642
++#: scd/app-openpgp.c:2797
  msgid "key already exists\n"
  msgstr "金鑰已存在\n"
  
- #: scd/app-openpgp.c:2646
++#: scd/app-openpgp.c:2801
  msgid "existing key will be replaced\n"
  msgstr "既有的金鑰將被取代\n"
  
- #: scd/app-openpgp.c:2648
++#: scd/app-openpgp.c:2803
  msgid "generating new key\n"
  msgstr "正在產生新的金鑰\n"
  
- #: scd/app-openpgp.c:2650
++#: scd/app-openpgp.c:2805
  msgid "writing new key\n"
  msgstr "正在寫入新的金鑰\n"
  
- #: scd/app-openpgp.c:3192 scd/app-openpgp.c:3544
++#: scd/app-openpgp.c:3347 scd/app-openpgp.c:3699
  msgid "creation timestamp missing\n"
  msgstr "缺漏創生時間戳印\n"
  
- #: scd/app-openpgp.c:3234 scd/app-openpgp.c:3242
++#: scd/app-openpgp.c:3389 scd/app-openpgp.c:3397
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
  
- #: scd/app-openpgp.c:3375 scd/app-openpgp.c:3650
++#: scd/app-openpgp.c:3530 scd/app-openpgp.c:3805
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "存放金鑰失敗: %s\n"
  
- #: scd/app-openpgp.c:3538
++#: scd/app-openpgp.c:3693
  #, fuzzy
  #| msgid "unsupported inquiry '%s'\n"
  msgid "unsupported curve\n"
  msgstr "未支援的查詢 '%s'\n"
  
- #: scd/app-openpgp.c:3805
++#: scd/app-openpgp.c:3960
  msgid "please wait while key is being generated ...\n"
  msgstr "正在產生金鑰中, 請稍候 ...\n"
  
- #: scd/app-openpgp.c:3813
++#: scd/app-openpgp.c:3968
  msgid "generating key failed\n"
  msgstr "產生金鑰時失敗\n"
  
- #: scd/app-openpgp.c:3819
++#: scd/app-openpgp.c:3974
  #, 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:3853
++#: scd/app-openpgp.c:4008
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3903
++#: scd/app-openpgp.c:4058
  msgid "fingerprint on card does not match requested one\n"
  msgstr "卡片上的指紋與所要求的那個並不吻合\n"
  
- #: scd/app-openpgp.c:4019
++#: scd/app-openpgp.c:4174
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡片不支援 %s 摘要演算法\n"
  
- #: scd/app-openpgp.c:4104
++#: scd/app-openpgp.c:4259
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前建立的簽章: %lu\n"
  
- #: scd/app-openpgp.c:4573
++#: scd/app-openpgp.c:4728
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
  
- #: scd/app-openpgp.c:4874 scd/app-openpgp.c:4885
++#: scd/app-openpgp.c:5029 scd/app-openpgp.c:5040
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@@ -7710,51 -6109,39 +7743,51 @@@ msgstr "|N|開始新增個人識別碼 
  msgid "run in multi server mode (foreground)"
  msgstr "以多重伺服器模式執行 (前景)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:176
++#: scd/scdaemon.c:124 sm/gpgsm.c:338 dirmngr/dirmngr.c:178
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|等級|設定除錯等級為指定等級"
  
- #: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
++#: scd/scdaemon.c:131 tools/gpgconf-comp.c:656
  msgid "|FILE|write a log to FILE"
  msgstr "|檔案|將日誌寫入至指定檔案"
  
- #: scd/scdaemon.c:134
++#: scd/scdaemon.c:133
  msgid "|N|connect to reader at port N"
  msgstr "|N|從 N 埠連線至讀卡機"
  
- #: scd/scdaemon.c:136
++#: scd/scdaemon.c:135
  msgid "|NAME|use NAME as ct-API driver"
  msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
  
- #: scd/scdaemon.c:138
++#: scd/scdaemon.c:137
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
  
- #: scd/scdaemon.c:141
++#: scd/scdaemon.c:140
  msgid "do not use the internal CCID driver"
  msgstr "不要使用內部的 CCID 驅動程式"
  
- #: scd/scdaemon.c:147
++#: scd/scdaemon.c:146
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
  
- #: scd/scdaemon.c:150
++#: scd/scdaemon.c:149
  msgid "do not use a reader's pinpad"
  msgstr "不要使用讀卡機鍵盤"
  
- #: scd/scdaemon.c:155
++#: scd/scdaemon.c:154
  msgid "deny the use of admin card commands"
  msgstr "禁用管理者卡片指令"
  
- #: scd/scdaemon.c:158
++#: scd/scdaemon.c:157
  msgid "use variable length input for pinpad"
  msgstr "輸入 PIN 時在輸入區顯示成變動長度"
  
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
  msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
  
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
@@@ -7766,22 -6152,14 +7799,17 @@@ msgstr "
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
  
- #: scd/scdaemon.c:1163 dirmngr/dirmngr.c:1902
++#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1981
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "用於 fd %d 的經手程式已啟動\n"
  
- #: scd/scdaemon.c:1175 dirmngr/dirmngr.c:1907
++#: scd/scdaemon.c:1169 dirmngr/dirmngr.c:1986
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "用於 fd %d 的經手程式已終止\n"
  
- #: sm/base64.c:327
- #, c-format
- msgid "invalid radix64 character %02x skipped\n"
- msgstr "已跳過無效的 radix64 字符 %02x\n"
- 
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
@@@ -7800,12 -6175,10 +7828,12 @@@ msgstr "chain
  msgid "shell"
  msgstr "shell"
  
- #: sm/certchain.c:256 dirmngr/validate.c:107
++#: sm/certchain.c:256 dirmngr/validate.c:144
  #, c-format
  msgid "critical certificate extension %s is not supported"
  msgstr "未支援關鍵憑證擴充欄位 %s"
  
- #: sm/certchain.c:295 dirmngr/validate.c:205
++#: sm/certchain.c:295 dirmngr/validate.c:242
  msgid "issuer certificate is not marked as a CA"
  msgstr "發行者憑證並未標記為 CA"
  
@@@ -7818,11 -6189,9 +7846,11 @@@ msgstr "關鍵已標記原則沒有已�
  msgid "failed to open '%s': %s\n"
  msgstr "開啟 '%s' 失敗: %s\n"
  
- #: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
++#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:204
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "請注意: 不允許非關鍵的憑證原則"
  
- #: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
++#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
  msgid "certificate policy not allowed"
  msgstr "未允許憑證原則"
  
@@@ -7849,9 -6213,6 +7877,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:264
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
++#: sm/encrypt.c:342 sm/import.c:415 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"
  
@@@ -7872,12 -6229,10 +7900,12 @@@ msgstr "請確認 \"dirmngr\" 已安裝
  msgid "checking the CRL failed: %s"
  msgstr "檢查 CRL 時失敗: %s"
  
- #: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "有效性無效的憑證: %s"
  
- #: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
  msgid "certificate not yet valid"
  msgstr "憑證尚未生效"
  
@@@ -7889,7 -6242,6 +7917,7 @@@ msgstr "根憑證尚未生效
  msgid "intermediate certificate not yet valid"
  msgstr "媒介憑證尚未生效"
  
- #: sm/certchain.c:1086 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:526
  msgid "certificate has expired"
  msgstr "憑證已過期"
  
@@@ -7938,7 -6279,6 +7966,7 @@@ msgstr "  (憑證有效自 
  msgid "  (     issuer valid from "
  msgstr "  (        發行者有效自 "
  
- #: sm/certchain.c:1218 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:577
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "指紋=%s\n"
@@@ -7967,7 -6301,6 +7995,7 @@@ msgstr "憑證中找不到發行者
  msgid "self-signed certificate has a BAD signature"
  msgstr "自簽憑證有 不良 簽章"
  
- #: sm/certchain.c:1515 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:575
  msgid "root certificate is not marked trusted"
  msgstr "根憑證未標記為已信任"
  
@@@ -7976,28 -6308,22 +8004,28 @@@
  msgid "checking the trust list failed: %s\n"
  msgstr "檢查信任清單時失敗: %s\n"
  
- #: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
  msgid "certificate chain too long\n"
  msgstr "憑證鏈太長\n"
  
- #: sm/certchain.c:1574 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:642
  msgid "issuer certificate not found"
  msgstr "找不到發行者憑證"
  
- #: sm/certchain.c:1607 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:668
  msgid "certificate has a BAD signature"
  msgstr "憑證有 不良 簽章"
  
- #: sm/certchain.c:1639 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:692
  msgid "found another possible matching CA certificate - trying again"
  msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
  
- #: sm/certchain.c:1698 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:717
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
  
- #: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
  msgid "certificate is good\n"
  msgstr "憑證完好\n"
  
@@@ -8023,11 -6344,9 +8051,11 @@@ msgstr "已使用的驗證模型: %s
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
  
- #: sm/certcheck.c:244 sm/verify.c:202
++#: sm/certcheck.c:244 sm/verify.c:209
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(這是 MD2 演算法)\n"
  
- #: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
++#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:706
  msgid "none"
  msgstr "無"
  
@@@ -8061,36 -6375,28 +8089,36 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "建立於 %s, 於 %s 到期.\n"
  
- #: sm/certlist.c:122 dirmngr/validate.c:1075
++#: sm/certlist.c:122 dirmngr/validate.c:1111
  msgid "no key usage specified - assuming all usages\n"
  msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
  
- #: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
++#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1121
  #, c-format
  msgid "error getting key usage information: %s\n"
  msgstr "取得金鑰用途資訊時出錯: %s\n"
  
- #: sm/certlist.c:142 dirmngr/validate.c:1095
++#: sm/certlist.c:142 dirmngr/validate.c:1152
  msgid "certificate should not have been used for certification\n"
  msgstr "憑證應該還未被用於憑證\n"
  
- #: sm/certlist.c:154 dirmngr/validate.c:1107
++#: sm/certlist.c:154 dirmngr/validate.c:1162
  msgid "certificate should not have been used for OCSP response signing\n"
  msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
  
- #: sm/certlist.c:165 dirmngr/validate.c:1127
++#: sm/certlist.c:165 dirmngr/validate.c:1145
  msgid "certificate should not have been used for encryption\n"
  msgstr "憑證應該還未被用於加密\n"
  
- #: sm/certlist.c:166 dirmngr/validate.c:1129
++#: sm/certlist.c:166 dirmngr/validate.c:1135
  msgid "certificate should not have been used for signing\n"
  msgstr "憑證應該還未被用於簽署\n"
  
- #: sm/certlist.c:167 dirmngr/validate.c:1130
++#: sm/certlist.c:167 dirmngr/validate.c:1146
  msgid "certificate is not usable for encryption\n"
  msgstr "憑證無法用於加密\n"
  
- #: sm/certlist.c:168 dirmngr/validate.c:1131
++#: sm/certlist.c:168 dirmngr/validate.c:1136
  msgid "certificate is not usable for signing\n"
  msgstr "憑證無法用於簽署\n"
  
@@@ -8184,70 -6472,56 +8212,70 @@@ msgstr "第 %d 列: 以金鑰鑰柄 '%s
  msgid "line %d: key generation failed: %s <%s>\n"
  msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
  
- #: sm/certreqgen.c:1324
++#: sm/certreqgen.c:1328
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr "如欲完成此憑證請求, 請再輸入一次你剛才建立的金鑰密語.\n"
  
- #: sm/certreqgen-ui.c:162
++#: sm/certreqgen-ui.c:158
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
- #: sm/certreqgen-ui.c:163
++#: sm/certreqgen-ui.c:159
  #, c-format
  msgid "   (%d) Existing key\n"
  msgstr "   (%d) 現有的金鑰\n"
  
- #: sm/certreqgen-ui.c:164
++#: sm/certreqgen-ui.c:160
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr "   (%d) 卡片上現存的金鑰\n"
  
- #: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
++#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
  #, c-format
  msgid "error reading the card: %s\n"
  msgstr "讀取卡片時出錯: %s\n"
  
- #: sm/certreqgen-ui.c:237
++#: sm/certreqgen-ui.c:233
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "卡片序號: %s\n"
  
- #: sm/certreqgen-ui.c:249
++#: sm/certreqgen-ui.c:245
  msgid "Available keys:\n"
  msgstr "可用金鑰:\n"
  
- #: sm/certreqgen-ui.c:280
++#: sm/certreqgen-ui.c:276
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr "%s 金鑰可能的動作:\n"
  
- #: sm/certreqgen-ui.c:281
++#: sm/certreqgen-ui.c:277
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) 簽署, 加密\n"
  
- #: sm/certreqgen-ui.c:282
++#: sm/certreqgen-ui.c:278
  #, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) 簽署\n"
  
- #: sm/certreqgen-ui.c:283
++#: sm/certreqgen-ui.c:279
  #, c-format
  msgid "   (%d) encrypt\n"
  msgstr "   (%d) 加密\n"
  
- #: sm/certreqgen-ui.c:307
++#: sm/certreqgen-ui.c:303
  msgid "Enter the X.509 subject name: "
  msgstr "請輸入 X.509 主旨名稱: "
  
- #: sm/certreqgen-ui.c:311
++#: sm/certreqgen-ui.c:307
  msgid "No subject name given\n"
  msgstr "沒有給定的物件名稱\n"
  
- #: sm/certreqgen-ui.c:315
++#: sm/certreqgen-ui.c:311
  #, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "無效的主旨名稱標籤 '%.*s'\n"
@@@ -8257,72 -6531,55 +8285,72 @@@
  #. 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
++#: sm/certreqgen-ui.c:320
  #, c-format
  msgid "Invalid subject name '%s'\n"
  msgstr "無效的主旨名稱 '%s'\n"
  
- #: sm/certreqgen-ui.c:326
++#: sm/certreqgen-ui.c:322
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "16"
  
- #: sm/certreqgen-ui.c:338
++#: sm/certreqgen-ui.c:334
  msgid "Enter email addresses"
  msgstr "請輸入電子郵件地址"
  
- #: sm/certreqgen-ui.c:339
++#: sm/certreqgen-ui.c:335
  msgid " (end with an empty line):\n"
  msgstr " (以空白列結束):\n"
  
- #: sm/certreqgen-ui.c:343
++#: sm/certreqgen-ui.c:339
  msgid "Enter DNS names"
  msgstr "請輸入 DNS 名稱"
  
- #: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
++#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
  msgid " (optional; end with an empty line):\n"
  msgstr " (非必要; 以空白列結束):\n"
  
- #: sm/certreqgen-ui.c:348
++#: sm/certreqgen-ui.c:344
  msgid "Enter URIs"
  msgstr "請輸入 URI"
  
- #: sm/certreqgen-ui.c:355
++#: sm/certreqgen-ui.c:351
  msgid "Create self-signed certificate? (y/N) "
  msgstr "要建立自簽憑證嗎? (y/N) "
  
- #: sm/certreqgen-ui.c:382
++#: sm/certreqgen-ui.c:378
  msgid "These parameters are used:\n"
  msgstr "採用下列這些參數:\n"
  
- #: sm/certreqgen-ui.c:400
++#: sm/certreqgen-ui.c:396
  msgid "Now creating self-signed certificate.  "
  msgstr "現在正在建立自簽憑證.  "
  
- #: sm/certreqgen-ui.c:402
++#: sm/certreqgen-ui.c:398
  msgid "Now creating certificate request.  "
  msgstr "現在正在建立憑證請求.  "
  
- #: sm/certreqgen-ui.c:403
++#: sm/certreqgen-ui.c:399
  msgid "This may take a while ...\n"
  msgstr "這可能會花點時間 ...\n"
  
- #: sm/certreqgen-ui.c:414
++#: sm/certreqgen-ui.c:410
  msgid "Ready.\n"
  msgstr "準備妥當.\n"
  
- #: sm/certreqgen-ui.c:417
++#: sm/certreqgen-ui.c:413
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr "準備好了.  你現在就該把此請求送到你的 CA.\n"
  
- #: sm/certreqgen-ui.c:423
++#: sm/certreqgen-ui.c:419
  msgid "resource problem: out of core\n"
  msgstr "資源問題: 超出核心\n"
  
- #: sm/decrypt.c:332
++#: sm/decrypt.c:339
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(這是 RC2 演算法)\n"
  
- #: sm/decrypt.c:334
++#: sm/decrypt.c:341
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr "(這看起來不像是個加密過的訊息)\n"
  
@@@ -8455,7 -6681,6 +8483,7 @@@ msgstr "|檔案|將此金鑰鑰匙圈�
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
  
- #: sm/gpgsm.c:333 tools/gpgconf-comp.c:799
++#: sm/gpgsm.c:333 tools/gpgconf-comp.c:806
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
  
@@@ -8537,17 -6746,14 +8565,17 @@@ msgstr "存放憑證時出錯\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "基本的憑證檢查失敗了 - 未匯入\n"
  
- #: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
++#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "取得已存放的旗標時出錯: %s\n"
  
- #: sm/import.c:526 sm/import.c:558
++#: sm/import.c:531 sm/import.c:563
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "匯入憑證時出錯: %s\n"
  
- #: sm/import.c:746 tools/gpg-connect-agent.c:1433
++#: sm/import.c:751 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
  msgstr "讀取輸入時出錯: %s\n"
@@@ -8615,7 -6810,6 +8643,7 @@@ msgstr "
  "\n"
  "%s%s請問你是否真的確定要這樣做了?"
  
- #: sm/qualified.c:215 sm/verify.c:617
++#: sm/qualified.c:215 sm/verify.c:624
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
@@@ -8632,158 -6825,129 +8660,164 @@@ msgstr "
  "\"%s\"\n"
  "請注意, 這個憑證並 不會 建立出合格的簽章!"
  
- #: sm/sign.c:451
++#: sm/sign.c:454
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
  
- #: sm/sign.c:465
++#: sm/sign.c:468
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
  
- #: sm/sign.c:517
++#: sm/sign.c:520
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "檢查合格憑證時失敗: %s\n"
  
- #: sm/verify.c:450
++#: sm/verify.c:457
  msgid "Signature made "
  msgstr "簽章建立於 "
  
- #: sm/verify.c:454
++#: sm/verify.c:461
  msgid "[date not given]"
  msgstr "[   未給定日期  ]"
  
- #: sm/verify.c:455
++#: sm/verify.c:462
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
  msgstr " 以憑證 ID 0x%08lX\n"
  
- #: sm/verify.c:474
++#: sm/verify.c:481
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
  
- #: sm/verify.c:595
++#: sm/verify.c:602
  msgid "Good signature from"
  msgstr "完好的簽章來自於"
  
- #: sm/verify.c:596
++#: sm/verify.c:603
  msgid "                aka"
  msgstr "                亦即"
  
- #: sm/verify.c:614
++#: sm/verify.c:621
  msgid "This is a qualified signature\n"
  msgstr "這是一份合格簽章\n"
  
- #: dirmngr/certcache.c:106
++#: dirmngr/certcache.c:120
  #, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "無法啟始憑證快取鎖定: %s\n"
  
- #: dirmngr/certcache.c:117
++#: dirmngr/certcache.c:131
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr "無法取得憑證快取的讀取鎖定: %s\n"
  
- #: dirmngr/certcache.c:128
++#: dirmngr/certcache.c:142
  #, c-format
  msgid "can't acquire write lock on the certificate cache: %s\n"
  msgstr "無法取得憑證快取的寫入鎖定: %s\n"
  
- #: dirmngr/certcache.c:139
++#: dirmngr/certcache.c:153
  #, c-format
  msgid "can't release lock on the certificate cache: %s\n"
  msgstr "無法釋放憑證快取鎖定: %s\n"
  
- #: dirmngr/certcache.c:267
++#: dirmngr/certcache.c:293
  #, c-format
  msgid "dropping %u certificates from the cache\n"
  msgstr "正在從快取中拋棄 %u 份憑證\n"
  
- #: dirmngr/certcache.c:387
++#: dirmngr/certcache.c:409 dirmngr/certcache.c:496 dirmngr/certcache.c:606
  #, c-format
  msgid "can't parse certificate '%s': %s\n"
  msgstr "無法剖析憑證 '%s': %s\n"
  
- #: dirmngr/certcache.c:395
++#: dirmngr/certcache.c:417 dirmngr/certcache.c:503 dirmngr/certcache.c:615
  #, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "憑證 '%s' 已快取\n"
  
- #: dirmngr/certcache.c:399
++#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:623
  #, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "信任的憑證 '%s' 已載入\n"
  
- #: dirmngr/certcache.c:401
++#: dirmngr/certcache.c:423
  #, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "憑證 '%s' 已載入\n"
  
- #: dirmngr/certcache.c:405
++#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:625
  #, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "  SHA1 指紋 = %s\n"
  
- #: dirmngr/certcache.c:408
++#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:628
  msgid "   issuer ="
  msgstr "   發行者 ="
  
- #: dirmngr/certcache.c:409
++#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:629
  msgid "  subject ="
  msgstr "  主旨 ="
  
- #: dirmngr/certcache.c:413
++#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:617
  #, c-format
  msgid "error loading certificate '%s': %s\n"
  msgstr "載入憑證 '%s' 時出錯: %s\n"
  
- #: dirmngr/certcache.c:489
++#: dirmngr/certcache.c:801
  #, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "固定載入的憑證: %u\n"
  
- #: dirmngr/certcache.c:491
++#: dirmngr/certcache.c:803
  #, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "    執行時期快取的憑證: %u\n"
  
- #: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
++#: dirmngr/certcache.c:805
+ #, fuzzy, c-format
+ #| msgid "    runtime cached certificates: %u\n"
+ msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
+ msgstr "    執行時期快取的憑證: %u\n"
+ 
++#: dirmngr/certcache.c:824 dirmngr/dirmngr-client.c:385
  msgid "certificate already cached\n"
  msgstr "憑證早已快取\n"
  
- #: dirmngr/certcache.c:508
++#: dirmngr/certcache.c:826
  msgid "certificate cached\n"
  msgstr "憑證已快取\n"
  
- #: dirmngr/certcache.c:510 dirmngr/certcache.c:530
++#: dirmngr/certcache.c:828 dirmngr/certcache.c:848
 +#: dirmngr/dirmngr-client.c:389
  #, c-format
  msgid "error caching certificate: %s\n"
  msgstr "快取憑證時出錯: %s\n"
  
- #: dirmngr/certcache.c:593
++#: dirmngr/certcache.c:911
  #, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
  msgstr "無效的 SHA1 指紋字串 '%s'\n"
  
- #: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
++#: dirmngr/certcache.c:1357 dirmngr/certcache.c:1366
  #, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "以序號取得憑證時出錯: %s\n"
  
- #: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
++#: dirmngr/certcache.c:1518 dirmngr/certcache.c:1527
  #, c-format
  msgid "error fetching certificate by subject: %s\n"
  msgstr "以主旨取得憑證時出錯: %s\n"
  
- #: dirmngr/certcache.c:1315 dirmngr/validate.c:455
++#: dirmngr/certcache.c:1633 dirmngr/validate.c:483
  msgid "no issuer found in certificate\n"
  msgstr "憑證中找不到發行者\n"
  
- #: dirmngr/certcache.c:1325
++#: dirmngr/certcache.c:1643
  #, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
@@@ -8818,7 -6976,6 +8852,7 @@@ msgstr "正在移除快取檔案 '%s'\n
  msgid "not removing file '%s'\n"
  msgstr "不移除檔案 '%s'\n"
  
- #: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
++#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2209
  #, c-format
  msgid "error closing cache file: %s\n"
  msgstr "關閉快取檔案時出錯: %s\n"
@@@ -9037,7 -7150,6 +9071,7 @@@ msgstr "S/N %s 有效, 但位列入 CR
  msgid "error getting data from cache file: %s\n"
  msgstr "從快取檔案取得資料時出錯: %s\n"
  
- #: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
++#: dirmngr/crlcache.c:1542 dirmngr/validate.c:914
  #, c-format
  msgid "unknown hash algorithm '%s'\n"
  msgstr "未知的雜湊演算法 '%s'\n"
@@@ -9051,12 -7161,10 +9085,12 @@@ msgstr "演算法 %d 的 gcry_md_open �
  msgid "got an invalid S-expression from libksba\n"
  msgstr "從 libksba 得到無效的 S-表示式\n"
  
- #: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
++#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:176
  #, c-format
  msgid "converting S-expression failed: %s\n"
  msgstr "轉換 S-表示式時失敗: %s\n"
  
- #: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
++#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:422
  #, c-format
  msgid "creating S-expression failed: %s\n"
  msgstr "建立 S-表示式時失敗: %s\n"
@@@ -9104,145 -7203,116 +9138,145 @@@ msgstr "正在以 authorityKeyIdentifie
  msgid "CRL signature verification failed: %s\n"
  msgstr "CRL 簽章驗證失敗: %s\n"
  
- #: dirmngr/crlcache.c:1858
++#: dirmngr/crlcache.c:1860
  #, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2001
++#: dirmngr/crlcache.c:2003
  #, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "ksba_crl_new 失敗: %s\n"
  
- #: dirmngr/crlcache.c:2008
++#: dirmngr/crlcache.c:2010
  #, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "ksba_crl_set_reader 失敗: %s\n"
  
- #: dirmngr/crlcache.c:2042
++#: dirmngr/crlcache.c:2044
  #, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
  
- #: dirmngr/crlcache.c:2046
++#: dirmngr/crlcache.c:2048
  #, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
  
- #: dirmngr/crlcache.c:2056
++#: dirmngr/crlcache.c:2058
  #, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2066
++#: dirmngr/crlcache.c:2068
  #, c-format
  msgid "crl_parse_insert failed: %s\n"
  msgstr "crl_parse_insert 失敗: %s\n"
  
- #: dirmngr/crlcache.c:2076
++#: dirmngr/crlcache.c:2078
  #, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2083
++#: dirmngr/crlcache.c:2085
  #, c-format
  msgid "error closing temporary cache file '%s': %s\n"
  msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2108
++#: dirmngr/crlcache.c:2110
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
  
- #: dirmngr/crlcache.c:2112
++#: dirmngr/crlcache.c:2114
  #, c-format
  msgid "new CRL still too old; it expired on %s\n"
  msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
  
- #: dirmngr/crlcache.c:2128
++#: dirmngr/crlcache.c:2130
  #, c-format
  msgid "unknown critical CRL extension %s\n"
  msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
  
- #: dirmngr/crlcache.c:2138
++#: dirmngr/crlcache.c:2140
  #, c-format
  msgid "error reading CRL extensions: %s\n"
  msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2189
++#: dirmngr/crlcache.c:2191
  #, c-format
  msgid "creating cache file '%s'\n"
  msgstr "建立快取檔案 '%s' 時出錯\n"
  
- #: dirmngr/crlcache.c:2221
++#: dirmngr/crlcache.c:2223
  #, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
  msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
  
- #: dirmngr/crlcache.c:2235
++#: dirmngr/crlcache.c:2237
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
  msgstr "更新 DIR 檔案時失敗 - 下次程式啟動時將失去快取項目\n"
  
- #: dirmngr/crlcache.c:2272
++#: dirmngr/crlcache.c:2274
  #, c-format
  msgid "Begin CRL dump (retrieved via %s)\n"
  msgstr "開始 CRL 傾印 (經由 %s 取得)\n"
  
- #: dirmngr/crlcache.c:2295
++#: dirmngr/crlcache.c:2297
  msgid ""
  " ERROR: The CRL will not be used because it was still too old after an "
  "update!\n"
  msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
  
- #: dirmngr/crlcache.c:2298
++#: dirmngr/crlcache.c:2300
  msgid ""
  " ERROR: The CRL will not be used due to an unknown critical extension!\n"
  msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
  
- #: dirmngr/crlcache.c:2301
++#: dirmngr/crlcache.c:2303
  msgid " ERROR: The CRL will not be used\n"
  msgstr " 錯誤: 將不採用此 CRL\n"
  
- #: dirmngr/crlcache.c:2308
++#: dirmngr/crlcache.c:2310
  msgid " ERROR: This cached CRL may have been tampered with!\n"
  msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
  
- #: dirmngr/crlcache.c:2326
++#: dirmngr/crlcache.c:2328
  msgid " WARNING: invalid cache record length\n"
  msgstr " 警告: 無效的快取記錄長度\n"
  
- #: dirmngr/crlcache.c:2333
++#: dirmngr/crlcache.c:2335
  #, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "讀取快取記錄時發生問題: %s\n"
  
- #: dirmngr/crlcache.c:2344
++#: dirmngr/crlcache.c:2346
  #, c-format
  msgid "problem reading cache key: %s\n"
  msgstr "讀取快取金鑰時發生問題: %s\n"
  
- #: dirmngr/crlcache.c:2375
++#: dirmngr/crlcache.c:2377
  #, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "從資料庫讀取快取項目時出錯: %s\n"
  
- #: dirmngr/crlcache.c:2378
++#: dirmngr/crlcache.c:2380
  msgid "End CRL dump\n"
  msgstr "CRL 傾印結束\n"
  
- #: dirmngr/crlcache.c:2499
++#: dirmngr/crlcache.c:2501
  #, c-format
  msgid "crl_fetch via DP failed: %s\n"
  msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
  
- #: dirmngr/crlcache.c:2510
++#: dirmngr/crlcache.c:2512
  #, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
  msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
  
- #: dirmngr/crlcache.c:2570
++#: dirmngr/crlcache.c:2572
  #, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@@ -9251,49 -7320,37 +9285,49 @@@
  msgid "reader to file mapping table full - waiting\n"
  msgstr "讀取程式至檔案映射表已滿 - 正在等待\n"
  
- #: dirmngr/crlfetch.c:182
++#: dirmngr/crlfetch.c:183
  msgid "using \"http\" instead of \"https\"\n"
  msgstr "正改以 \"http\" 代替 \"https\"\n"
  
- #: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
- #: dirmngr/crlfetch.c:359
++#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:292 dirmngr/crlfetch.c:330
++#: dirmngr/crlfetch.c:362
  #, c-format
  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:743 dirmngr/misc.c:571
++#: dirmngr/crlfetch.c:226 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
  #, c-format
  msgid "error initializing reader object: %s\n"
  msgstr "啟始讀取程式物件時出錯: %s\n"
  
- #: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
++#: dirmngr/crlfetch.c:252 dirmngr/ocsp.c:219
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
  
- #: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
++#: dirmngr/crlfetch.c:271 dirmngr/ocsp.c:236
  msgid "too many redirections\n"
  msgstr "太多重新導向\n"
  
- #: dirmngr/crlfetch.c:274
++#: dirmngr/crlfetch.c:277
  #, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "取回 '%s' 時出錯: %s\n"
  
- #: dirmngr/crlfetch.c:279
++#: dirmngr/crlfetch.c:282
  #, c-format
  msgid "error retrieving '%s': http status %u\n"
  msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
  
- #: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
- #: dirmngr/crlfetch.c:381
++#: dirmngr/crlfetch.c:299 dirmngr/crlfetch.c:325 dirmngr/crlfetch.c:357
++#: dirmngr/crlfetch.c:384
  #, fuzzy
  #| msgid "CRL access not possible due to disabled %s\n"
  msgid "CRL access not possible due to Tor mode\n"
  msgstr "不可能存取 CRL 因已停用 %s\n"
  
- #: dirmngr/crlfetch.c:386
++#: dirmngr/crlfetch.c:389
  #, c-format
  msgid "certificate search not possible due to disabled %s\n"
  msgstr "不可能進行憑證搜尋, 因為已停用 %s\n"
@@@ -9433,112 -7461,84 +9467,112 @@@ msgstr "應該要有絕對檔名\n
  msgid "looking up '%s'\n"
  msgstr "正在查找 '%s'\n"
  
- #: dirmngr/dirmngr.c:160
++#: dirmngr/dirmngr.c:162
  msgid "list the contents of the CRL cache"
  msgstr "列出 CRL 快取的內容"
  
- #: dirmngr/dirmngr.c:161
++#: dirmngr/dirmngr.c:163
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|檔案|從指定檔案載入 CRL 至快取"
  
- #: dirmngr/dirmngr.c:162
++#: dirmngr/dirmngr.c:164
  msgid "|URL|fetch a CRL from URL"
  msgstr "|網址|從指定網址取得 CRL"
  
- #: dirmngr/dirmngr.c:163
++#: dirmngr/dirmngr.c:165
  msgid "shutdown the dirmngr"
  msgstr "關閉 dirmngr"
  
- #: dirmngr/dirmngr.c:164
++#: dirmngr/dirmngr.c:166
  msgid "flush the cache"
  msgstr "清除快取"
  
- #: dirmngr/dirmngr.c:179 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:728
- #: tools/gpgconf-comp.c:813 tools/gpgconf-comp.c:909
++#: dirmngr/dirmngr.c:181 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:733
++#: tools/gpgconf-comp.c:820 tools/gpgconf-comp.c:916
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
  
- #: dirmngr/dirmngr.c:180
++#: dirmngr/dirmngr.c:182
  msgid "run without asking a user"
  msgstr "以不詢問使用者的方式執行"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:183
  msgid "force loading of outdated CRLs"
  msgstr "強迫載入過時的 CRL"
  
- #: dirmngr/dirmngr.c:182
++#: dirmngr/dirmngr.c:184
  msgid "allow sending OCSP requests"
  msgstr "允許送出 OCSP 請求"
  
- #: dirmngr/dirmngr.c:184
++#: dirmngr/dirmngr.c:186
  msgid "allow online software version check"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:187
  msgid "inhibit the use of HTTP"
  msgstr "避免使用 HTTP"
  
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:188
  msgid "inhibit the use of LDAP"
  msgstr "避免使用 LDAP"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:190
  msgid "ignore HTTP CRL distribution points"
  msgstr "忽略 HTTP CRL 分布點"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:192
  msgid "ignore LDAP CRL distribution points"
  msgstr "忽略 LDAP CRL 分布點"
  
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:194
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "忽略含有 OCSP 伺服器網址的憑證"
  
- #: dirmngr/dirmngr.c:195
++#: dirmngr/dirmngr.c:197
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
  
- #: dirmngr/dirmngr.c:197
++#: dirmngr/dirmngr.c:199
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|主機|指定 LDAP 查詢主機"
  
- #: dirmngr/dirmngr.c:199
++#: dirmngr/dirmngr.c:201
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "不要將主機備案與 --ldap-proxy 並用"
  
- #: dirmngr/dirmngr.c:202
++#: dirmngr/dirmngr.c:204
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:206
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
  
- #: dirmngr/dirmngr.c:207 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:209 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|把 LDAP 逾時設成 N 秒"
  
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:212
  msgid "|URL|use OCSP responder at URL"
  msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
  
- #: dirmngr/dirmngr.c:212
++#: dirmngr/dirmngr.c:214
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
  
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:220
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|單次查詢不要傳回超過 N 筆項目"
  
- #: dirmngr/dirmngr.c:223
++#: dirmngr/dirmngr.c:225
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
  
- #: dirmngr/dirmngr.c:225
++#: dirmngr/dirmngr.c:227
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:246
++#: dirmngr/dirmngr.c:251
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9547,11 -7547,9 +9581,11 @@@ msgstr "
  "@\n"
  "(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:361
++#: dirmngr/dirmngr.c:381
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
  
- #: dirmngr/dirmngr.c:363
++#: dirmngr/dirmngr.c:383
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9559,77 -7557,60 +9593,77 @@@ msgstr "
  "語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
  
- #: dirmngr/dirmngr.c:443
++#: dirmngr/dirmngr.c:463
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有效的除錯等級為: %s\n"
  
- #: dirmngr/dirmngr.c:499 tools/gpgconf.c:551 tools/gpgconf.c:586
++#: dirmngr/dirmngr.c:539 tools/gpgconf.c:551 tools/gpgconf.c:586
 +#: tools/gpgconf.c:669
  #, c-format
  msgid "usage: %s [options] "
  msgstr "用法: %s [選項] "
  
- #: dirmngr/dirmngr.c:1071
++#: dirmngr/dirmngr.c:1146
  msgid "colons are not allowed in the socket name\n"
  msgstr "socket 名稱內不允許使用冒號\n"
  
- #: dirmngr/dirmngr.c:1297 dirmngr/server.c:1628
++#: dirmngr/dirmngr.c:1372 dirmngr/server.c:1632
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1303 dirmngr/server.c:1634
++#: dirmngr/dirmngr.c:1378 dirmngr/server.c:1638
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1484
++#: dirmngr/dirmngr.c:1563
  #, 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:1618 dirmngr/dirmngr.c:1702
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 偵測到無效的指紋\n"
  
- #: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601 tools/gpgconf-comp.c:4090
++#: dirmngr/dirmngr.c:1654 dirmngr/dirmngr.c:1680 tools/gpgconf-comp.c:4121
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 讀取錯誤: %s\n"
  
- #: dirmngr/dirmngr.c:1630
++#: dirmngr/dirmngr.c:1709
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 列尾的垃圾已忽略\n"
  
- #: dirmngr/dirmngr.c:1697
++#: dirmngr/dirmngr.c:1776
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
  
- #: dirmngr/dirmngr.c:1736
++#: dirmngr/dirmngr.c:1815
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "收到 SIGUSR2 - 無定義行動\n"
  
- #: dirmngr/dirmngr.c:1741
++#: dirmngr/dirmngr.c:1820
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "收到 SIGTERM - 正在關閉 ...\n"
  
- #: dirmngr/dirmngr.c:1743
++#: dirmngr/dirmngr.c:1822
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
  
- #: dirmngr/dirmngr.c:1748
++#: dirmngr/dirmngr.c:1827
  msgid "shutdown forced\n"
  msgstr "已強迫關閉\n"
  
- #: dirmngr/dirmngr.c:1756
++#: dirmngr/dirmngr.c:1835
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "收到 SIGINT - 立即關閉\n"
  
- #: dirmngr/dirmngr.c:1763
++#: dirmngr/dirmngr.c:1842
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "收到訊號 %d - 無定義行動\n"
@@@ -9859,35 -7792,28 +9893,35 @@@ msgstr "主機名稱中有無效的字�
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
  
- #: dirmngr/ldap.c:98 dirmngr/misc.c:510
++#: dirmngr/ldap.c:98 dirmngr/misc.c:512
  #, c-format
  msgid "malloc failed: %s\n"
  msgstr "動態記憶體配置失敗: %s\n"
  
- #: dirmngr/ldap.c:627
++#: dirmngr/ldap.c:617
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr "start_cert_fetch: 無效的模式 '%s'\n"
  
- #: dirmngr/ldap.c:840
++#: dirmngr/ldap.c:830
  msgid "ldap_search hit the size limit of the server\n"
  msgstr "ldap_search 達到伺服器的尺寸限制\n"
  
- #: dirmngr/misc.c:170
++#: dirmngr/misc.c:172
  msgid "invalid canonical S-expression found\n"
  msgstr "發現無效的標準型 S-表示式\n"
  
- #: dirmngr/misc.c:194 dirmngr/misc.c:228
++#: dirmngr/misc.c:196 dirmngr/misc.c:230
  #, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "gcry_md_open 失敗: %s\n"
  
- #: dirmngr/misc.c:199 dirmngr/misc.c:233
++#: dirmngr/misc.c:201 dirmngr/misc.c:235
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
  msgstr "糟了: ksba_cert_hash 失敗: %s\n"
  
- #: dirmngr/misc.c:526
++#: dirmngr/misc.c:528
  msgid "bad URL encoding detected\n"
  msgstr "偵測到不良的網址編碼\n"
  
@@@ -9921,243 -7841,187 +9955,239 @@@ msgstr "設定 OCSP 目標時出錯: %s
  msgid "error building OCSP request: %s\n"
  msgstr "建立 OCSP 請求時出錯: %s\n"
  
- #: dirmngr/ocsp.c:181
++#: dirmngr/ocsp.c:182
  #, c-format
  msgid "error connecting to '%s': %s\n"
  msgstr "連線至 '%s' 時出錯: %s\n"
  
- #: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
++#: dirmngr/ocsp.c:208 dirmngr/ocsp.c:256
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
  
- #: dirmngr/ocsp.c:240
++#: dirmngr/ocsp.c:241
  #, c-format
  msgid "error accessing '%s': http status %u\n"
  msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
  
- #: dirmngr/ocsp.c:265
++#: dirmngr/ocsp.c:266
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
  msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
  
- #: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
++#: dirmngr/ocsp.c:289 dirmngr/ocsp.c:299
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
  
- #: dirmngr/ocsp.c:293
++#: dirmngr/ocsp.c:294
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
  msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
  
- #: dirmngr/ocsp.c:328
++#: dirmngr/ocsp.c:329
  msgid "not signed by a default OCSP signer's certificate"
  msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
  
- #: dirmngr/ocsp.c:413
++#: dirmngr/ocsp.c:414
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr "OCSP 回應僅支援 SHA-1\n"
  
- #: dirmngr/ocsp.c:464
++#: dirmngr/ocsp.c:465
  #, c-format
  msgid "allocating list item failed: %s\n"
  msgstr "配置清單項目時失敗: %s\n"
  
- #: dirmngr/ocsp.c:479
++#: dirmngr/ocsp.c:480
  #, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "取得回應程式 ID 時出錯: %s\n"
  
- #: dirmngr/ocsp.c:514
++#: dirmngr/ocsp.c:515
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
  
- #: dirmngr/ocsp.c:553 dirmngr/validate.c:619
++#: dirmngr/ocsp.c:554 dirmngr/validate.c:648
  #, c-format
  msgid "issuer certificate not found: %s\n"
  msgstr "找不到發行者憑證: %s\n"
  
- #: dirmngr/ocsp.c:563
++#: dirmngr/ocsp.c:564
  msgid "caller did not return the target certificate\n"
  msgstr "叫用者未傳為目標憑證\n"
  
- #: dirmngr/ocsp.c:570
++#: dirmngr/ocsp.c:571
  msgid "caller did not return the issuing certificate\n"
  msgstr "叫用者未傳回發行的憑證\n"
  
- #: dirmngr/ocsp.c:580
++#: dirmngr/ocsp.c:581
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
  msgstr "配置 OCSP 脈絡失敗: %s\n"
  
- #: dirmngr/ocsp.c:614
++#: dirmngr/ocsp.c:615
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
  msgstr "無法取得 authorityInfoAccess: %s\n"
  
- #: dirmngr/ocsp.c:621
++#: dirmngr/ocsp.c:622
  msgid "no default OCSP responder defined\n"
  msgstr "無定義預設 OCSP 回應程式\n"
  
- #: dirmngr/ocsp.c:627
++#: dirmngr/ocsp.c:628
  msgid "no default OCSP signer defined\n"
  msgstr "未定義預設的 OCSP 簽署程式\n"
  
- #: dirmngr/ocsp.c:634
++#: dirmngr/ocsp.c:635
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
  
- #: dirmngr/ocsp.c:639
++#: dirmngr/ocsp.c:640
  #, c-format
  msgid "using OCSP responder '%s'\n"
  msgstr "正在使用 %s OCSP 回應程式\n"
  
- #: dirmngr/ocsp.c:646
++#: dirmngr/ocsp.c:647
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
  
- #: dirmngr/ocsp.c:676
++#: dirmngr/ocsp.c:677
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
  msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
  
- #: dirmngr/ocsp.c:701
++#: dirmngr/ocsp.c:702
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
  
- #: dirmngr/ocsp.c:702
++#: dirmngr/ocsp.c:703
  msgid "good"
  msgstr "良好"
  
- #: dirmngr/ocsp.c:708
++#: dirmngr/ocsp.c:709
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
  msgstr "憑證已撤銷於 %s 因: %s\n"
  
- #: dirmngr/ocsp.c:743
++#: dirmngr/ocsp.c:744
  msgid "OCSP responder returned a status in the future\n"
  msgstr "OCSP 回應程式傳回未來的狀態\n"
  
- #: dirmngr/ocsp.c:755
++#: dirmngr/ocsp.c:756
  msgid "OCSP responder returned a non-current status\n"
  msgstr "OCSP 回應程式傳回非當下的狀態\n"
  
- #: dirmngr/ocsp.c:770
++#: dirmngr/ocsp.c:771
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP 回應程式傳回老舊的狀態\n"
  
- #: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:384 dirmngr/server.c:493 dirmngr/server.c:539
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s) 失敗: %s\n"
  
- #: dirmngr/server.c:981
++#: dirmngr/server.c:985
  msgid "ldapserver missing"
  msgstr "遺失 ldapserver"
  
- #: dirmngr/server.c:1055
++#: dirmngr/server.c:1059
  msgid "serialno missing in cert ID"
  msgstr "憑證 ID 中遺失 serialno"
  
- #: dirmngr/server.c:1191 dirmngr/server.c:1277 dirmngr/server.c:1713
- #: dirmngr/server.c:1764 dirmngr/server.c:2256 dirmngr/server.c:2272
++#: dirmngr/server.c:1195 dirmngr/server.c:1281 dirmngr/server.c:1717
++#: dirmngr/server.c:1788 dirmngr/server.c:2320 dirmngr/server.c:2336
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquire 失敗: %s\n"
  
- #: dirmngr/server.c:1320
++#: dirmngr/server.c:1324
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url 失敗: %s\n"
  
- #: dirmngr/server.c:1332 dirmngr/server.c:1363 dirmngr/server.c:1522
++#: dirmngr/server.c:1336 dirmngr/server.c:1367 dirmngr/server.c:1526
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: dirmngr/server.c:1470
++#: dirmngr/server.c:1474
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch 失敗: %s\n"
  
- #: dirmngr/server.c:1503
++#: dirmngr/server.c:1507
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert 失敗: %s\n"
  
- #: dirmngr/server.c:1530
++#: dirmngr/server.c:1534
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d 已超出\n"
  
- #: dirmngr/server.c:2512
++#: dirmngr/server.c:2580
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "無法配置控制結構: %s\n"
  
- #: dirmngr/server.c:2523
++#: dirmngr/server.c:2591
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "配置 assuan 脈絡失敗: %s\n"
  
- #: dirmngr/server.c:2544
++#: dirmngr/server.c:2612
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "伺服器啟始失敗: %s\n"
  
- #: dirmngr/server.c:2552
++#: dirmngr/server.c:2620
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "向 Assuan 註冊指令時失敗: %s\n"
  
- #: dirmngr/server.c:2583
++#: dirmngr/server.c:2651
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan 接受問題: %s\n"
  
- #: dirmngr/server.c:2602
++#: dirmngr/server.c:2670
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan 處理時失敗: %s\n"
  
- #: dirmngr/validate.c:201
++#: dirmngr/validate.c:238
  msgid "accepting root CA not marked as a CA"
  msgstr "接受未標示為 CA 的根 CA"
  
- #: dirmngr/validate.c:227
++#: dirmngr/validate.c:264
  msgid "CRL checking too deeply nested\n"
  msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
  
- #: dirmngr/validate.c:245
++#: dirmngr/validate.c:282
  msgid "not checking CRL for"
  msgstr "不對此檢查 CRL:"
  
- #: dirmngr/validate.c:250
++#: dirmngr/validate.c:287
  msgid "checking CRL for"
  msgstr "檢查 CRL: "
  
- #: dirmngr/validate.c:528
++#: dirmngr/validate.c:556
  msgid "selfsigned certificate has a BAD signature"
  msgstr "自簽憑證有 不良 簽章"
  
- #: dirmngr/validate.c:561
++#: dirmngr/validate.c:590
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "檢查根憑證可信度時失敗: %s\n"
  
- #: dirmngr/validate.c:738
++#: dirmngr/validate.c:769
  msgid "certificate chain is good\n"
  msgstr "憑證鏈完好\n"
  
- #: dirmngr/validate.c:968
- msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
- 
- #: dirmngr/validate.c:1116
++#: dirmngr/validate.c:1169
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "憑證應該還未被用於 CRL 簽署\n"
  
@@@ -10252,197 -8095,150 +10282,197 @@@ 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:766 tools/gpgconf-comp.c:865
++#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:684
++#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:872
  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:779 tools/gpgconf-comp.c:888
++#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:622 tools/gpgconf-comp.c:697
++#: tools/gpgconf-comp.c:786 tools/gpgconf-comp.c:895
  msgid "Options controlling the configuration"
  msgstr "控制著組態的選項"
  
- #: 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
++#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:651 tools/gpgconf-comp.c:728
++#: tools/gpgconf-comp.c:815 tools/gpgconf-comp.c:908
  msgid "Options useful for debugging"
  msgstr "對除錯有幫助的選項"
  
- #: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:821
++#: tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:828
  msgid "Options controlling the security"
  msgstr "控制著安全性的選項"
  
- #: tools/gpgconf-comp.c:528
++#: tools/gpgconf-comp.c:529
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
  
- #: tools/gpgconf-comp.c:532
++#: tools/gpgconf-comp.c:533
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
  
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
  msgid "|N|set maximum SSH key lifetime to N seconds"
  msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
  
- #: tools/gpgconf-comp.c:560
++#: tools/gpgconf-comp.c:561
  msgid "Options enforcing a passphrase policy"
  msgstr "強制執行密語原則的選項"
  
- #: tools/gpgconf-comp.c:563
++#: tools/gpgconf-comp.c:564
  msgid "do not allow bypassing the passphrase policy"
  msgstr "不允許略過密語原則"
  
- #: tools/gpgconf-comp.c:567
++#: tools/gpgconf-comp.c:568
  msgid "|N|set minimal required length for new passphrases to N"
  msgstr "|N|把新密語所需的最短長度設成 N"
  
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
  msgid "|N|require at least N non-alpha characters for a new passphrase"
  msgstr "|N|新密語至少要有 N 個非字母的字符"
  
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
  
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|在 N 天之後讓密語過期"
  
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
  msgid "do not allow the reuse of old passphrases"
  msgstr "不允許重複使用舊密語"
  
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
  #, fuzzy
  #| msgid "|N|set LDAP timeout to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr "|N|把 LDAP 逾時設成 N 秒"
  
- #: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:781
++#: tools/gpgconf-comp.c:699 tools/gpgconf-comp.c:788
  msgid "|NAME|use NAME as default secret key"
  msgstr "|名字|使用指定名字做為預設私鑰"
  
- #: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:784
++#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|名字|也加密給指定名字的使用者 ID"
  
- #: tools/gpgconf-comp.c:704
++#: tools/gpgconf-comp.c:705
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|設定電子郵件別名"
  
- #: tools/gpgconf-comp.c:736 tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:741 tools/gpgconf-comp.c:947
  msgid "Configuration for Keyservers"
  msgstr "金鑰伺服器組態"
  
- #: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:942
++#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:949
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|使用位於 URL 的金鑰伺服器"
  
- #: tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:746
  msgid "allow PKA lookups (DNS requests)"
  msgstr "允許 PKA 查找 (DNS 請求)"
  
- #: tools/gpgconf-comp.c:744
++#: tools/gpgconf-comp.c:749
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
  
- #: tools/gpgconf-comp.c:793
++#: tools/gpgconf-comp.c:800
  msgid "disable all access to the dirmngr"
  msgstr "停用所有的 dirmngr 存取"
  
- #: tools/gpgconf-comp.c:796
++#: tools/gpgconf-comp.c:803
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
  msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
  
- #: tools/gpgconf-comp.c:829
++#: tools/gpgconf-comp.c:836
  msgid "do not check CRLs for root certificates"
  msgstr "不要為根憑證檢查 CRL"
  
- #: tools/gpgconf-comp.c:878
++#: tools/gpgconf-comp.c:885
  msgid "Options controlling the format of the output"
  msgstr "控制著輸出格式的選項"
  
- #: tools/gpgconf-comp.c:920
++#: tools/gpgconf-comp.c:927
  msgid "Options controlling the interactivity and enforcement"
  msgstr "控制著互動及強制執行的選項"
  
- #: tools/gpgconf-comp.c:933
++#: tools/gpgconf-comp.c:940
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "控制著安全性的選項"
  
- #: tools/gpgconf-comp.c:947
++#: tools/gpgconf-comp.c:954
  msgid "Configuration for HTTP servers"
  msgstr "HTTP 伺服器組態"
  
- #: tools/gpgconf-comp.c:958
++#: tools/gpgconf-comp.c:965
  msgid "use system's HTTP proxy setting"
  msgstr "使用系統的 HTTP 代理伺服器設定"
  
- #: tools/gpgconf-comp.c:963
++#: tools/gpgconf-comp.c:970
  msgid "Configuration of LDAP servers to use"
  msgstr "要用的 LDAP 伺服器組態"
  
- #: tools/gpgconf-comp.c:992
++#: tools/gpgconf-comp.c:999
  msgid "LDAP server list"
  msgstr "LDAP 伺服器清單"
  
- #: tools/gpgconf-comp.c:1000
++#: tools/gpgconf-comp.c:1007
  msgid "Configuration for OCSP"
  msgstr "OCSP 組態"
  
- #: tools/gpgconf-comp.c:1081
++#: tools/gpgconf-comp.c:1088
  #, fuzzy
  #| msgid "GPG for OpenPGP"
  msgid "OpenPGP"
  msgstr "OpenPGP 版 GPG"
  
- #: tools/gpgconf-comp.c:1082
++#: tools/gpgconf-comp.c:1089
  msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1083
++#: tools/gpgconf-comp.c:1090
  #, fuzzy
  #| msgid "Smartcard Daemon"
  msgid "Smartcards"
  msgstr "智慧卡服務"
  
- #: tools/gpgconf-comp.c:1084
++#: tools/gpgconf-comp.c:1091
  #, fuzzy
  #| msgid "GPG for S/MIME"
  msgid "S/MIME"
  msgstr "S/MIME 版 GPG"
  
- #: tools/gpgconf-comp.c:1085
++#: tools/gpgconf-comp.c:1092
  msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1086
++#: tools/gpgconf-comp.c:1093
  #, fuzzy
  #| msgid "PIN and Passphrase Entry"
  msgid "Passphrase Entry"
  msgstr "個人識別碼及密語項目"
  
- #: tools/gpgconf-comp.c:1277
++#: tools/gpgconf-comp.c:1284
  msgid "Component not suitable for launching"
  msgstr "元件不適合啟動"
  
- #: tools/gpgconf-comp.c:3361
++#: tools/gpgconf-comp.c:3400
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "元件 %s 的外部驗證失敗"
  
- #: tools/gpgconf-comp.c:3520
++#: tools/gpgconf-comp.c:3551
  msgid "Note that group specifications are ignored\n"
  msgstr "請注意群組規格已忽略\n"
  
- #: tools/gpgconf-comp.c:4094
++#: tools/gpgconf-comp.c:4125
  #, fuzzy, c-format
  #| msgid "error closing '%s': %s\n"
  msgid "error closing '%s'\n"
  msgstr "關閉 '%s' 時出錯: %s\n"
  
- #: tools/gpgconf-comp.c:4096
++#: tools/gpgconf-comp.c:4127
  #, fuzzy, c-format
  #| msgid "error hashing '%s': %s\n"
  msgid "error parsing '%s'\n"

-- 
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