[Pkg-gnupg-commit] [gnupg2] 127/132: New upstream version 2.1.21
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed May 17 03:07:53 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 d2d4174a24828e1603a84bb6aa93ee6207604a68
Merge: 6478793 9574820
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 16 22:38:08 2017 -0400
New upstream version 2.1.21
AUTHORS | 3 +
ChangeLog | 851 +++++++++++++
Makefile.am | 14 +
NEWS | 25 +-
README | 17 +-
VERSION | 2 +-
agent/Makefile.am | 2 +-
tests/openpgp/issue2929.scm => agent/all-tests.scm | 27 +-
agent/cache.c | 73 +-
agent/call-pinentry.c | 8 +-
agent/call-scd.c | 4 +-
agent/command-ssh.c | 24 +-
agent/command.c | 11 +-
agent/findkey.c | 6 +-
agent/gpg-agent.c | 1 -
agent/pkdecrypt.c | 2 +-
agent/pksign.c | 2 +-
agent/trustlist.c | 2 +-
build-aux/speedo/w32/g4wihelp.c | 64 +-
build-aux/speedo/w32/inst.nsi | 158 ++-
common/ChangeLog-2011.include | 2 +-
common/Makefile.am | 3 +-
.../openpgp/issue2929.scm => common/all-tests.scm | 43 +-
common/audit.c | 2 +-
common/b64dec.c | 1 +
common/call-gpg.c | 2 +-
common/dotlock.c | 2 +-
common/exechelp.h | 4 +-
common/exectool.c | 2 +-
common/init.h | 2 +-
common/logging.c | 12 +-
common/openpgp-oid.c | 2 +-
common/openpgpdefs.h | 12 +-
common/recsel.c | 2 +-
common/sexputil.c | 4 +-
common/simple-pwquery.h | 2 +-
common/stringhelp.c | 41 +-
common/stringhelp.h | 2 +-
common/sysutils.c | 2 +-
common/t-session-env.c | 2 +-
common/t-stringhelp.c | 7 +-
configure.ac | 14 +-
dirmngr/cdblib.c | 2 +-
dirmngr/certcache.c | 2 +-
dirmngr/dirmngr-client.c | 2 +-
dirmngr/dirmngr.c | 8 +-
dirmngr/dns-stuff.c | 38 +-
dirmngr/dns-stuff.h | 6 +-
dirmngr/dns.c | 67 +-
dirmngr/http.c | 54 +-
dirmngr/ks-engine-hkp.c | 1 +
dirmngr/ldap-wrapper-ce.c | 13 +-
dirmngr/ldap-wrapper.c | 2 +-
dirmngr/loadswdb.c | 4 +-
dirmngr/server.c | 6 +-
dirmngr/t-http.c | 4 +
dirmngr/validate.c | 6 +-
doc/HACKING | 4 +-
doc/defsincdate | 2 +-
doc/dirmngr.texi | 2 +-
doc/gpg-agent.texi | 4 +-
doc/gpg.texi | 17 +-
doc/gpgsm.texi | 4 +-
g10/Makefile.am | 13 +-
tests/openpgp/issue2929.scm => g10/all-tests.scm | 27 +-
g10/armor.c | 4 +-
g10/call-agent.c | 2 +-
g10/compress-bz2.c | 3 +-
g10/dirmngr-conf.skel | 73 --
g10/export.c | 39 +-
g10/getkey.c | 7 +-
g10/gpg.c | 13 +-
g10/gpgcompose.c | 4 +-
g10/import.c | 8 +-
g10/keydb.h | 4 +-
g10/keyedit.c | 8 +-
g10/keygen.c | 4 +-
g10/keylist.c | 4 +-
g10/keyring.c | 11 +-
g10/main.h | 2 -
g10/misc.c | 23 +-
g10/openfile.c | 104 +-
g10/options.skel | 139 ---
g10/packet.h | 6 +-
g10/parse-packet.c | 5 +-
g10/pkclist.c | 2 +-
g10/seskey.c | 4 +-
g10/sign.c | 2 +-
g10/skclist.c | 30 +-
g10/t-stutter.c | 15 +-
g10/tdbio.c | 2 +-
g10/test.c | 6 +-
g10/tofu.c | 36 +-
g10/trustdb.c | 2 +-
g10/verify.c | 2 +-
g13/Makefile.am | 2 +-
tests/openpgp/issue2929.scm => g13/all-tests.scm | 27 +-
g13/backend.c | 2 +-
g13/create.c | 2 +-
g13/g13-common.h | 2 +-
g13/sh-dmcrypt.c | 6 +
kbx/keybox-blob.c | 4 +-
kbx/keybox-defs.h | 2 +-
kbx/keybox-openpgp.c | 2 +-
m4/lib-link.m4 | 2 +-
m4/po.m4 | 6 +-
po/ca.po | 665 ++++++-----
po/cs.po | 657 +++++-----
po/da.po | 664 +++++------
po/de.po | 712 ++++++-----
po/el.po | 665 ++++++-----
po/en at boldquot.po | 654 +++++-----
po/en at quot.po | 654 +++++-----
po/eo.po | 654 +++++-----
po/es.po | 663 +++++------
po/et.po | 662 +++++------
po/fi.po | 666 ++++++-----
po/fr.po | 658 +++++-----
po/gl.po | 662 +++++------
po/gnupg2.pot | 652 +++++-----
po/hu.po | 664 +++++------
po/id.po | 662 +++++------
po/it.po | 666 ++++++-----
po/ja.po | 683 ++++++-----
po/nb.po | 657 +++++-----
po/pl.po | 662 +++++------
po/pt.po | 662 +++++------
po/ro.po | 665 ++++++-----
po/ru.po | 659 +++++------
po/sk.po | 662 +++++------
po/sv.po | 664 +++++------
po/tr.po | 664 +++++------
po/uk.po | 659 +++++------
po/zh_CN.po | 662 +++++------
po/zh_TW.po | 656 +++++-----
scd/apdu.c | 15 +-
scd/app-openpgp.c | 4 +-
scd/app-p15.c | 2 +-
scd/app.c | 4 +-
scd/atr.c | 2 +-
scd/ccid-driver.c | 684 ++---------
scd/command.c | 2 +-
scd/iso7816.c | 2 +-
sm/certlist.c | 4 +-
sm/gpgsm.c | 2 +-
sm/import.c | 2 +-
sm/keylist.c | 2 +-
sm/misc.c | 2 +-
sm/qualified.c | 2 +-
sm/server.c | 2 +-
sm/sign.c | 2 +-
tests/Makefile.am | 3 +-
tests/gpgme/Makefile.am | 10 +-
tests/gpgme/all-tests.scm | 86 ++
tests/gpgme/gpgme-defs.scm | 104 +-
tests/gpgme/run-tests.scm | 59 +-
tests/gpgme/setup.scm | 2 +-
tests/gpgme/wrap.scm | 3 +-
tests/gpgscm/Makefile.am | 6 +-
tests/gpgscm/gnupg.scm | 44 +
tests/gpgscm/init.scm | 14 +-
tests/gpgscm/lib.scm | 27 +-
tests/gpgscm/main.c | 45 +-
tests/gpgscm/makefile.scm | 76 ++
tests/gpgscm/opdefines.h | 379 +++---
tests/gpgscm/scheme-private.h | 29 +-
tests/gpgscm/scheme.c | 1251 ++++++++++----------
tests/gpgscm/scheme.h | 8 +-
tests/gpgscm/small-integers.h | 847 +++++++++++++
tests/gpgscm/t-child.c | 4 +-
tests/gpgscm/t-child.scm | 4 +-
tests/gpgscm/tests.scm | 278 +++--
tests/gpgscm/xml.scm | 142 +++
tests/gpgsm/Makefile.am | 10 +-
.../{openpgp/issue2929.scm => gpgsm/all-tests.scm} | 35 +-
tests/gpgsm/decrypt.scm | 4 +-
tests/gpgsm/encrypt.scm | 2 +-
tests/gpgsm/export.scm | 4 +-
tests/gpgsm/gpgsm-defs.scm | 12 +-
tests/gpgsm/import.scm | 4 +-
tests/gpgsm/run-tests.scm | 25 +-
tests/gpgsm/setup.scm | 10 +-
tests/gpgsm/sign.scm | 2 +-
tests/gpgsm/verify.scm | 2 +-
tests/inittests | 6 +-
tests/migrations/Makefile.am | 11 +-
.../issue2929.scm => migrations/all-tests.scm} | 27 +-
tests/migrations/common.scm | 11 +-
tests/migrations/extended-pkf.scm | 4 +-
tests/migrations/from-classic.scm | 8 +-
tests/migrations/issue2276.scm | 4 +-
tests/migrations/run-tests.scm | 14 +-
tests/openpgp/4gb-packet.scm | 9 +-
tests/openpgp/Makefile.am | 11 +-
tests/openpgp/README | 4 +-
tests/openpgp/all-tests.scm | 58 +
tests/openpgp/armdetach.scm | 4 +-
tests/openpgp/armdetachm.scm | 4 +-
tests/openpgp/armencrypt.scm | 4 +-
tests/openpgp/armencryptp.scm | 4 +-
tests/openpgp/armor.scm | 4 +-
tests/openpgp/armsignencrypt.scm | 4 +-
tests/openpgp/armsigs.scm | 4 +-
tests/openpgp/bug537-test.data.asc | 2 +-
tests/openpgp/clearsig.scm | 4 +-
tests/openpgp/compression.scm | 4 +-
tests/openpgp/conventional-mdc.scm | 6 +-
tests/openpgp/conventional.scm | 6 +-
tests/openpgp/decrypt-dsa.scm | 6 +-
tests/openpgp/decrypt-multifile.scm | 4 +-
tests/openpgp/decrypt-session-key.scm | 6 +-
tests/openpgp/decrypt-unwrap-verify.scm | 6 +-
tests/openpgp/decrypt.scm | 6 +-
tests/openpgp/default-key.scm | 4 +-
tests/openpgp/defs.scm | 84 +-
tests/openpgp/delete-keys.scm | 12 +-
tests/openpgp/detach.scm | 4 +-
tests/openpgp/detachm.scm | 4 +-
tests/openpgp/ecc.scm | 17 +-
tests/openpgp/enarmor.scm | 2 +-
tests/openpgp/encrypt-dsa.scm | 6 +-
tests/openpgp/encrypt-multifile.scm | 4 +-
tests/openpgp/encrypt.scm | 12 +-
tests/openpgp/encryptp.scm | 4 +-
tests/openpgp/export.scm | 2 +-
tests/openpgp/fake-pinentry.c | 2 +
tests/openpgp/genkey1024.scm | 2 +-
tests/openpgp/gpg-agent.conf.tmpl | 3 -
tests/openpgp/gpg.conf.tmpl | 4 -
tests/openpgp/gpgconf.scm | 2 +-
tests/openpgp/gpgtar.scm | 2 +-
tests/openpgp/gpgv-forged-keyring.scm | 4 +-
tests/openpgp/import-revocation-certificate.scm | 4 +-
tests/openpgp/import.scm | 12 +-
tests/openpgp/issue2015.scm | 2 +-
tests/openpgp/issue2346.scm | 4 +-
tests/openpgp/issue2417.scm | 4 +-
tests/openpgp/issue2419.scm | 4 +-
tests/openpgp/issue2929.scm | 2 +-
tests/openpgp/issue2941.scm | 2 +-
tests/openpgp/key-selection.scm | 4 +-
tests/openpgp/mds.scm | 2 +-
tests/openpgp/multisig.scm | 2 +-
tests/openpgp/quick-key-manipulation.scm | 6 +-
tests/openpgp/run-tests.scm | 25 +-
tests/openpgp/seat.scm | 4 +-
tests/openpgp/setup.scm | 20 +-
tests/openpgp/shell.scm | 2 +-
tests/openpgp/signencrypt-dsa.scm | 6 +-
tests/openpgp/signencrypt.scm | 7 +-
tests/openpgp/sigs-dsa.scm | 6 +-
tests/openpgp/sigs.scm | 8 +-
tests/openpgp/ssh-export.scm | 4 +-
tests/openpgp/ssh-import.scm | 6 +-
tests/openpgp/tofu.scm | 56 +-
tests/openpgp/use-exact-key.scm | 4 +-
tests/openpgp/verify-multifile.scm | 4 +-
tests/openpgp/verify.scm | 4 +-
tests/openpgp/version.scm | 2 +-
tests/pkits/Makefile.am | 2 +-
tests/pkits/README | 2 +-
tests/pkits/common.sh | 2 +-
tests/pkits/inittests | 4 +-
tests/run-tests.scm | 44 +
tools/gpg-connect-agent.c | 4 +-
tools/gpgconf-comp.c | 2 +-
tools/gpgconf.c | 2 +-
tools/gpgsplit.c | 7 +-
tools/mail-signed-keys | 2 +-
tools/rfc822parse.c | 3 +-
tools/symcryptrun.c | 2 +-
tools/watchgnupg.c | 2 +-
tools/wks-util.c | 2 +-
273 files changed, 14045 insertions(+), 12529 deletions(-)
diff --cc ChangeLog
index 5a76102,8bd68a6..63269be
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,22208 -1,16 +1,23059 @@@
-No more ChangeLog files
-========================
++2017-05-15 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.21.
++ + commit 9574820329128f0ea8a98f9bfc0e77c73c3e0ec0
+
+
++ po: Update German translation.
++ + commit 4bd079dbdb44067688377156413dd32a82a89d22
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++
++ gpg: Do not mark ", " translatable.
++ + commit 2d381b0f0ba97657e9fb2971eca6648bb77dd2cc
++ * g10/tofu.c (ask_about_binding): Remove useless translation markers.
++
++2017-05-15 Andre Heinecke <aheinecke at intevation.de>
++
++ dirmngr,w32: Fix ldap crl read on windows.
++ + commit abe3a9043f86b48b92ddcec47197e032e35a6f4f
++ Summary:
++ * dirmngr/ldap-wrapper-ce.c (outstream_cookie_s): Add buffer_read_pos.
++ (buffer_get_data): Use seperate read pos.
++
++2017-05-15 Werner Koch <wk at gnupg.org>
++
++ common: Let format_text return an error.
++ + commit 00b7767bc6fe309aa20375c859ebf708cfc7b9ea
++ * common/stringhelp.c (format_text): Return NULL on error.
++ * common/t-stringhelp.c (test_format_text): Adjust for change.
++ * g10/gpgcompose.c (show_help): Abort on out of core.
++ * g10/tofu.c (ask_about_binding): Abort on format_text error.
++ (show_statistics): Ditto.
++ (show_warning): Ditto.
++
++2017-05-11 Justus Winter <justus at g10code.com>
++
++ tests: Also run all OpenPGP tests using keyrings.
++ + commit bc01d62dc5d520e138499df5d80fb50f9e87e3e8
++ * tests/openpgp/all-tests.scm: Run each test twice, once with public
++ keys stored in a keybox, once with a keyring.
++ * tests/openpgp/defs.scm (create-gpghome): Create a public keyring to
++ make GnuPG use that instead of creating a keybox if '--use-keyring' is
++ given.
++ * tests/openpgp/setup.scm: Fix flag handling and usage.
++
++ tests: Make it possible to run all tests using our infrastructure.
++ + commit f4365790daa1d1400c7f0fe73ac9a6d25f0c6d0a
++ * Makefile.am (TESTS_ENVIRONMENT): New variable.
++ (check-all): New phony target to run all tests.
++ * tests/gpgme/gpgme-defs.scm (have-gpgme?): New function that tests
++ whether the GPGME test suite is available instead of exiting the
++ process.
++ * tests/gpgscm/init.scm (export): New macro.
++ * tests/gpgscm/tests.scm (run-tests): New function.
++ (load-tests): Likewise.
++ * tests/gpgme/run-tests.scm: Simplify and move the parsing of the list
++ of tests to 'all-tests.scm'.
++ * tests/gpgsm/run-tests.scm: Likewise.
++ * tests/migrations/run-tests.scm: Likewise.
++ * tests/openpgp/run-tests.scm: Likewise.
++ * tests/gpgme/Makefile.am: To select the tests to run, use the
++ variable 'TESTS'. This harmonizes the interface with the automake
++ test suite.
++ * tests/gpgsm/Makefile.am: Likewise.
++ * tests/migrations/Makefile.am: Likewise.
++ * tests/openpgp/Makefile.am: Likewise.
++ * tests/openpgp/README: Likewise.
++ * agent/all-tests.scm: New file.
++ * common/all-tests.scm: Likewise.
++ * g10/all-tests.scm: Likewise.
++ * g13/all-tests.scm: Likewise.
++ * tests/gpgme/all-tests.scm: Likewise.
++ * tests/gpgsm/all-tests.scm: Likewise.
++ * tests/migrations/all-tests.scm: Likewise.
++ * tests/openpgp/all-tests.scm: Likewise.
++ * tests/run-tests.scm: Likewise.
++
++ tests: Move the makefile parser.
++ + commit 78d6a25a2db22ad2ae30d57ca980c0400cfef726
++ * tests/gpgme/gpgme-defs.scm (parse-makefile, parse-makefile-expand):
++ Move...
++ * tests/gpgscm/makefile.scm: ... here.
++ * tests/gpgscm/Makefile.am (EXTRA_DIST): Add new file.
++
++ gpgscm: Make it possible to set the logfile name.
++ + commit 29ef34cc4cb23e7b743dbf4cc8e5761f06076b9a
++ * tests/gpgscm/tests.scm (test): Only set the default log filename
++ when it has not been set before.
++
++2017-05-10 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10, sm, dirmngr, common: Add comment for fall through.
++ + commit 0ce94a9698104d9bfc73d5a37478189564c96eb4
++ * common/b64dec.c (b64dec_proc): Comment to clarify.
++ * dirmngr/cdblib.c (cdb_make_put): Use same pattern to clarify.
++ * dirmngr/dirmngr-client.c (read_pem_certificate): Likewise.
++ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Likewise.
++ * g10/armor.c (unarmor_pump): Likewise.
++ * g10/gpg.c (main): Likewise.
++ * g10/import.c (read_block): Likewise.
++ * g10/keygen.c (make_backsig): Likewise.
++ * g10/pkclist.c (check_signatures_trust): Likewise.
++ * sm/gpgsm.c (main): Likewise.
++
++ g10: Stop compiler warning for t-stutter.
++ + commit 98b759119c81c5b39f34f8a9a7b6a57e91ad6470
++ * g10/t-stutter.c (do_test): Refer current_test_group_failed.
++
++2017-05-08 Justus Winter <justus at g10code.com>
++
++ gpg: Properly account for ring trust packets.
++ + commit 22739433e98be80e46fe7d01d52a9627c1aebaae
++ * g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
++ instead of counting ourself.
++ * g10/packet.h (struct parse_packet_ctx_s): New field
++ 'n_parsed_packets'.
++ (init_parse_packet): Initialize new field.
++ * g10/parse-packet.c (parse): Count packets.
++
++2017-05-04 Justus Winter <justus at g10code.com>
++
++ tests: Support tests that are expected to fail.
++ + commit d6b46462f8c5c705ffb7cf8af03465a926aa11d3
++ * tests/gpgscm/tests.scm (test-pool): Rework reporting. Filter using
++ the computed test status instead of the return value. Also print the
++ new categories 'failed expectedly' and 'passed unexpectedly'.
++ (test): If a test ends with a bang (!), it is expected to fail. Adapt
++ status, status-string, and xml accordingly.
++
++ tests: Add function to dump packets.
++ + commit eab0138e3179f247180a639a91570e5ee2c6ad0e
++ * tests/openpgp/defs.scm (gpg-dump-packets): New function.
++
++2017-05-03 Andre Heinecke <aheinecke at intevation.de>
++
++ speedo,w32: Fix silent user mode installation.
++ + commit d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22
++ * build-aux/speedo/w32/inst.nsi (AddToPath): Move account
++ check here.
++ (PrintNonAdminWarning): Remove is_user_install variable.
++
++2017-05-03 Justus Winter <justus at g10code.com>
++
++ gpgscm: Create and re-use frame objects.
++ + commit 8a168a6d4052ec31fed77c79bb96ffdd32bf9646
++ * tests/gpgscm/scheme-private.h (struct scheme): New field
++ 'frame_freelist'.
++ * tests/gpgscm/scheme.c (enum scheme_types): New type 'T_FRAME'.
++ (type_to_string): Handle new type.
++ (settype): New macro.
++ (gc_disable): Make sure there is at least one frame in the free list.
++ (mark): Handle frame objects.
++ (finalize_cell): Likewise.
++ (dump_stack_initialize): Initialize free list.
++ (dump_stack_free): Simplify.
++ (frame_length): New variable.
++ (dump_stack_make_frame): New function.
++ (frame_slots): Likewise.
++ (frame_payload): New macro.
++ (dump_stack_allocate_frame): New function.
++ (dump_stack_deallocate_frame): Likewise.
++ (dump_stack_preallocate_frame): Likewise.
++ (_s_return): Unpack frame object and deallocate it.
++ (s_save): Wrap state in an frame object.
++ (dump_stack_mark): Mark the free list.
++
++ gpgscm: Merge opexe_0.
++ + commit 9c6407d17e0cb9f4a370b1b83e7816577ec7d29d
++ * tests/gpgscm/scheme-private.h (struct scheme): Remove field 'op'.
++ * tests/gpgscm/scheme.c (opexe_0): Inline into 'Eval_Cycle'.
++ (_Error_1): Return the opcode to evaluate next.
++ (Error_1): Do not return, but set the opcode and goto dispatch.
++ (Error_0): Likewise.
++ (s_goto): Likewise.
++ (s_return): Likewise.
++ (s_return_enable_gc): Likewise.
++ (s_thread_to): Remove superfluous cast.
++ (_s_return): Return the opcode to evaluate next.
++ (scheme_init_custom_alloc): Adapt to removal of field 'op'.
++
++2017-05-03 Andre Heinecke <aheinecke at intevation.de>
++
++ speedo,w32: Allow installation as normal user.
++ + commit cacfd4bce94704b531f68ee76fb40789e44fde67
++ * build-aux/speedo/w32/g4wihelp.c (ENV_HK_USER, ENV_REG_USER):
++ New defines.
++ (path_add): Handle is_user_install variable. Don't abort
++ if Path reg key does not exist. Fix crash if Path reg key
++ does not contain a semicolon.
++ (path_remove): Handle is_user_install variable. Fix crash
++ if Path reg key does not exist.
++ * build-aux/speedo/w32/inst.nsi: Remove obsolete HAVE_STARTMENU
++ this was double guarded with WITH_GUI. Add Multiuser plugin and
++ defines for this. Use SHCTX instead of HKLM / HKCU.
++ (PrintNonAdminWarning): Only Warn and don't abort.
++
++2017-05-02 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ g10: Remove skeleton options files.
++ + commit 201f86803017c1db373023f7b506d4a0dc644bbc
++ * build-aux/speed/w32/inst.nsi: stop installing skeleton files.
++ * doc/gpg.texi: stop documenting skeleton files.
++ * g10/Makefile.am: stop installing skeleton files.
++ * g10/openfile.c (copy_options_file): Remove.
++ (try_make_homedir): do not call copy_options_file.
++
++2017-04-27 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: For signing, prefer available card key when no -u option.
++ + commit 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
++ * g10/skclist.c (build_sk_list): Ask gpg-agent if card is available.
++ Then, use the card key if any.
++
++2017-04-26 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Minor clean up.
++ + commit 2262a80c5f44433a08bc0e21b77d9efe51596f21
++ * g10/main.h (complete_sig): Remove declaration.
++ * g10/sign.c (complete_sig): Make it static.
++
++2017-04-25 NIIBE Yutaka <gniibe at fsij.org>
++ Tomas Mraz
++
++ dirmngr: Fix aliasing problem in dns.c.
++ + commit 247932f367f856e7ce91528e14f0aaf838150857
++ * dirmngr/dns.c (dns_ai_setent): Care about aliasing.
++
++2017-04-25 NIIBE Yutaka <gniibe at fsij.org>
++
++ tests: Remove *.conf.tmpl from Makefile.
++ + commit 7851d73fd7f424f9a649690e1cb3055feb792c51
++ * tests/openpgp/Makefile.am (TEST_FILES): Remove gpg.conf.tmpl
++ and gpg-agent.conf.tmpl.
++
++ g10: invalidate the fd cache for keyring.
++ + commit 116cfd60779fbb3540da629db54dc2e148f4a3a2
++ * g10/keyring.c (keyring_search_reset): Don't keep the FD cache.
++
++2017-04-24 Andre Heinecke <aheinecke at intevation.de>
++
++ w32: Enable wildcard expansion with mingw-w64.
++ + commit 2e71bf30f038ca0e142acbb6f650ce029105f8a2
++ * g10/gpg.c: Define _dowildcard = -1;
++
++2017-04-24 Justus Winter <justus at g10code.com>
++
++ tests: Fix Python detection.
++ + commit ef1922b3b19df0aa7f8c15d503c603f76fc13f82
++ * tests/gpgme/gpgme-defs.scm (python): Fix Python detection.
++
++ gpgscm: Refactor cell finalization.
++ + commit d2f6798621d751cd6ae6f091c4a2af4569c5b8aa
++ * tests/gpgscm/scheme.c (finalize_cell): Use switch, return whether
++ the cell may be freed.
++ (gc): Update callsite.
++
++ gpgscm: Tweak error message display.
++ + commit 78547bfe8a885579438a17abadca02b62cce2844
++ * tests/gpgscm/init.scm (throw'): If the first argument to the error
++ is a string, display it as such.
++
++ tests: Deduplicate and simplify code.
++ + commit 06a177ceea529269a7404740c60416bd6a4567b1
++ * tests/gpgme/gpgme-defs.scm (create-file): Move...
++ * tests/gpgsm/gpgsm-defs.scm (create-file): ... likewise...
++ * tests/openpgp/defs.scm (create-file): Here.
++ (create-gpghome): Use 'create-file'.
++ * tests/openpgp/gpg-agent.conf.tmpl: Delete file.
++ * tests/openpgp/gpg.conf.tmpl: Likewise.
++
++ gpgscm: Fix test.
++ + commit 9ae63b9caefdf3e925c5928667fcd9227132d27f
++ * tests/gpgscm/t-child.scm: Use 'string-length' on the string.
++
++ gpgscm: Improve syntax checking.
++ + commit 4aab0e6ac7f2887a6f38f0cb95365dd7c30b4b18
++ * tests/gpgscm/scheme.c (opexe_0): Make sure closure arguments are
++ symbols.
++
++ gpgscm: Emit JUnit-style XML reports.
++ + commit ee715201ae784e840b6136393289e6dbd6f4c540
++ * tests/gpgscm/Makefile.am (EXTRA_DIST): Add new file.
++ * tests/gpgscm/lib.scm (string-translate): New function.
++ * tests/gpgscm/main.c (main): Load new file.
++ * tests/gpgscm/tests.scm (dirname): New function.
++ (test-pool): Record execution times, emit XML report.
++ (test): Record execution times, record log file name, emit XML report.
++ (run-tests-parallel): Write XML report.
++ (run-tests-sequential): Likewise.
++ * tests/gpgscm/xml.scm: New file.
++ * tests/gpgme/Makefile.am (CLEANFILES): Add 'report.xml'.
++ * tests/gpgsm/Makefile.am: Likewise.
++ * tests/migrations/Makefile.am: Likewise.
++ * tests/openpgp/Makefile.am: Likewise.
++
++ gpgscm: Make logging less verbose and more useful.
++ + commit 679920781a25ae5c0e49d4bd78e6926fd661778f
++ * tests/gpgscm/tests.scm (call-with-io): When being verbose, include
++ the pid in the output, and avoid duplicating the command arguments.
++
++ gpgscm: Make test framework less functional.
++ + commit a71f4142e13e2cc26ef0cd62f56a1ccb7ce678ee
++ * tests/gpgscm/tests.scm (test-pool, tests): Previously, these methods
++ updated objects by creating new updated copies of the object being
++ manipulated. This made the code awkward without any benefit,
++ therefore I change it to just update the object.
++
++ gpgscm: Move 'trace' and 'stringify'.
++ + commit f03d6897be904da58cad76b4bd07729922b47616
++ * tests/gpgscm/tests.scm (trace, stringify): Move...
++ * tests/gpgscm/lib.scm: ... here.
++
++ gpgscm: Avoid fruitless garbage collection cycles.
++ + commit 245860ecaf8b9e82ca577385abd453ac92ffcd26
++ * tests/gpgscm/scheme-private.h (CELL_MINRECOVER): New macro.
++ * tests/gpgscm/scheme.c (_get_cell): Move the heuristic to get more
++ cells...
++ (gc): ... here where every caller benefits from the optimization.
++
++2017-04-20 NIIBE Yutaka <gniibe at fsij.org>
++
++ g13: Fix for Solaris.
++ + commit 10519270d36586c536bfb6c4cda8ac17c01f4976
++ * configure.ac: Check sys/mkdev.h.
++ * g13/sh-dmcrypt.c: Include sys/mkdev.h.
++
++2017-04-18 NIIBE Yutaka <gniibe at fsij.org>
++
++ dirmngr: Fix final close of LISTEN_FD.
++ + commit 4b2581dc0ea1d03e70023bb0748aa0c21c0a2173
++ * dirmngr/dirmngr.c (handle_connections): Close LISTEN_FD.
++
++ dirmngr: Fix API difference for Windows.
++ + commit 0d0a7efa8fa0accc1da851917376e2328ef33c96
++ * dirmngr/http.c (read_server, write_server): Use assuan_fd_t.
++ (http_wait_response): Use FD2INT to get unsigned integer fd.
++ (read_server, write_server): Likewise.
++ (simple_cookie_read, simple_cookie_write): Use assuan_fd_t.
++
++2017-04-17 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: More minor change.
++ + commit 9296aed4bd2ad09d23339e658264e557c5312585
++ * agent/command.c (cmd_pksign): Remove redundant assignment.
++
++ agent: Minor cleanup.
++ + commit 45c52cca1401b930878a8f901b63cfbb22e9e327
++ * agent/command-ssh.c (ssh_key_to_protected_buffer): Not touch ERR.
++ * agent/command.c (cmd_genkey, cmd_import_key): Clean up.
++
++ tests: Minor memory fix.
++ + commit b9440aa3693a4bb91e1ba8ff09e2d93ff22dd70a
++ * tests/openpgp/fake-pinentry.c (get_passphrase): Free the memory.
++
++ g10: Fix parse_ring_trust.
++ + commit 256e861bce3dc9aba8fab4df47a40cae3bede175
++ * g10/parse-packet.c (parse_ring_trust): Fix condition.
++
++ g10: Minor fixes.
++ + commit 0dec0cc281dfa26db89f8cc5ee002dea5c2b2e81
++ * g10/export.c (cleartext_secret_key_to_openpgp): No initialization.
++ (do_export_one_keyblock): Initialize with GPG_ERR_NOT_FOUND.
++ * g10/getkey.c (get_best_pubkey_byname): Add non-null check.
++ * g10/tofu.c (tofu_set_policy): ERR initialize to 0.
++
++ g10: Fix import/export filter property match.
++ + commit af5f8ecf51f5e1f33e832d4946d02313b78a0536
++ * g10/import.c (impex_filter_getval): Fix to "else if".
++
++2017-04-14 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Clean up error initialize/return.
++ + commit 36c4e540f1a4992675ee6e0acca1231325457079
++ * agent/call-pinentry.c (start_pinentry): Return RC.
++ * agent/command-ssh.c (ssh_handler_request_identities): Don't set ERR.
++ * agent/findkey.c (try_unprotect_cb): Return ERR.
++ (unprotect): Don't set RC.
++ * agent/gpg-agent.c (handle_connections): Don't set fd.
++
++ dirmngr: More fix for test program.
++ + commit adb77d095b3958482863a17c83746f33945638dc
++ * dirmngr/t-http.c (main): Care about no TLS.
++
++ dirmngr: More fix for Windows.
++ + commit 4771bad610eb59e701fe8e53468e2af22d45eeb0
++ * dirmngr/http.c (simple_cookie_read, simple_cookie_write): Only
++ valid with HTTP_USE_NTBTLS.
++ (_my_socket_new): Simply cast to int since it's for debug.
++ (_my_socket_ref, _my_socket_unref): Likewise.
++
++2017-04-13 NIIBE Yutaka <gniibe at fsij.org>
++
++ dirmngr: Fix http.c for sockaddr_storage.
++ + commit 86dcb03134fd4957d51ebaa06b7991239f9ee56a
++ dirmngr/http.c (use_socks): Use sockaddr_storage.
++ (my_sock_new_for_addr, connect_server): Likewise.
++
++ dirmngr: Fix alignment of ADDR.
++ + commit 892b33bb2c57785927ea6652091191da2deed464
++ * dirmngr/dns-stuff.h (dns_addrinfo_s): Use struct sockaddr_storage
++ for size and alignment.
++ * dirmngr/dns-stuff.c (resolve_name_libdns): Follow the change.
++ (resolve_dns_name): Use struct sockaddr_storage.
++ (resolve_addr_standard, resolve_dns_addr): Likewise.
++ (resolve_dns_addr): Likewise.
++
++ dirmngr: Fix thread key type.
++ + commit 37018adce6ea4920b34d59afcfe4f55f716b3086
++ * dirmngr/dirmngr.c (my_tlskey_current_fd): Use npth_key_t.
++
++ common, g10: Fix enumeration types.
++ + commit 74258278efacd7069e8c1df8ff6fc3f4675d713e
++ * common/openpgpdefs.h (CIPHER_ALGO_PRIVATE10, PUBKEY_ALGO_PRIVATE10)
++ (DIGEST_ALGO_PRIVATE10, COMPRESS_ALGO_PRIVATE10): New.
++ * g10/misc.c (map_pk_gcry_to_openpgp): Add type conversion.
++ (map_cipher_openpgp_to_gcry, openpgp_cipher_algo_name)
++ (openpgp_pk_test_algo2, map_md_openpgp_to_gcry)
++ (pubkey_get_npkey): Add default handling.
++
++ dirmngr: More fix for Windows.
++ + commit 5af104b541ed430a54eb0163a1d29e1d043f9377
++ * dirmngr/dns.c (socket_fd_t, STDCALL): New.
++ (dns_te_initname): Use.
++
++2017-04-12 NIIBE Yutaka <gniibe at fsij.org>
++
++ dirmngr: Fix type of sock.
++ + commit 6755b3b505f79a5a233b18e85f57a0d3a455e664
++ * dirmngr/http.c (send_request): Use assuan_fd_t for SOCK.
++
++ tools: Fix condition for gpg-connect-agent.
++ + commit f52f6af834cc488d11612e349e4af023d69a45f4
++ * tools/gpg-connect-agent.c (start_agent): Add paren.
++
++ dirmngr: Fix possible null reference.
++ + commit 7ae1857c90ab43ad9e31f0fb6dbd37f25cc37278
++ * dirmngr/dns.c (dns_error_t dns_trace_fput): Check NULL.
++
++ common: Simplify format_text.
++ + commit 7b4edf14bb16fbe786e55b829a208960396ce8df
++ * common/stringhelp.c (format_text): Don't allow IN_PLACE formatting.
++ * common/stringhelp.h: Change the API with no IN_PLACE.
++ * common/t-stringhelp.c (test_format_text): Follow the change.
++ * g10/gpgcompose.c (show_help): Likewise.
++ * g10/tofu.c (format_conflict_msg_part1, ask_about_binding)
++ (show_statistics, show_warning): Likewise.
++
++ gpgscm: Fix test program.
++ + commit 7f9032d4a8ce53ce1a972bd3c1f8d20b3776756b
++ * tests/gpgscm/t-child.c (main): Fix for setmode.
++
++ dirmngr: Fix plus1_ns.
++ + commit 60d9a9e6b4ae3af029596d14732c02f49203326d
++ * dirmngr/dns.c (plus1_ns): Fix the initial implementation.
++
++ scd: Handle unexpected suspend/resume by CCID driver.
++ + commit f053f99ed0b0c6de7b7c4a07cbd7f7d213ddf0db
++ * scd/ccid-driver.c (bulk_in): Handle unexpected failure.
++
++ dirmngr: Fix dns-stuff.c in another way.
++ + commit bd0c94939faf8ccfc117fb595e9bc0105edcafa4
++ * dirmngr/dns-stuff.c (T_CERT): Define our own.
++
++ Revert "dirmngr: Fix dns-stuff.c."
++ + commit 0b904ddea8bddaa2fd7893a9dce1df1cb5e36b00
++ This reverts commit 1538523156be568046f632d1775eae30ea8bd556.
++
++ dirmngr: Fix dns-stuff.c.
++ + commit 1538523156be568046f632d1775eae30ea8bd556
++ * dirmngr/dns-stuff.c: Don't include arpa/nameser.h.
++
++ agent: Simplify stream_read_cstring.
++ + commit c64763c3a74ecc61c2f6c5edb679a2a3879d79e7
++ * agent/command-ssh.c (stream_read_cstring): Just call
++ stream_read_string.
++
++ dirmngr: Use a function to increment network short.
++ + commit 64904ce627b6b0661acf15b5b70103c4842bb0f3
++ * dirmngr/dns.c (plus1_ns): New.
++ (dns_p_push): Use it.
++
++ g10: Minor clean up for export.c.
++ + commit 05218829589f6d4b09933fa19f568c2019367d5c
++ * g10/export.c (export_ssh_key): Check IDENTIFIER for error.
++ Release base64 thing on error of get_membuf.
++
++2017-04-11 NIIBE Yutaka <gniibe at fsij.org>
++
++ g13: Include sys/sysmacros.h if available.
++ + commit c3cc9551dcc89cc25c0a0ec16d8eb12c1c221638
++ * configure.ac: Add test for sys/sysmacros.h.
++ * g13/sh-dmcrypt.c: Include sys/sysmacros.h.
++
++2017-04-11 Justus Winter <justus at g10code.com>
++
++ tests: Fix distcheck.
++ + commit 00be2a92625e832e8dd621f2a8f72b124c6d50ca
++ * tests/gpgscm/Makefile.am (EXTRA_DIST): Add 'gnupg.scm'.
++
++ tests: Avoid relying on implicit gpg commands.
++ + commit cde626e7f7349a73d58ec3236ab3b43dec852bb5
++ * tests/openpgp/armdetach.scm: Always use an explicit command instead
++ of relying on gpg to guess what we want.
++ * 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/compression.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/detach.scm: Likewise.
++ * tests/openpgp/detachm.scm: Likewise.
++ * tests/openpgp/ecc.scm: Likewise.
++ * tests/openpgp/encrypt-dsa.scm: Likewise.
++ * tests/openpgp/encrypt-multifile.scm: Likewise.
++ * tests/openpgp/encrypt.scm: Likewise.
++ * tests/openpgp/encryptp.scm: Likewise.
++ * tests/openpgp/seat.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: Make tests more robust.
++ + commit 1b28d9dbe0260b2a4645c4b5caae11d9f375c942
++ * tests/openpgp/defs.scm (have-opt-always-trust): Execute in empty
++ ephemeral home directory. This prevents gpg from picking up the
++ configuration from the current gnupghome (if any).
++ * tests/migrations/common.scm (untar-armored): Likewise.
++
++ tests: Move common functionality.
++ + commit ccd2187212c12b84c86a10fd4417a16536243179
++ * tests/openpgp/defs.scm (with-home-directory,
++ with-ephemeral-home-directory): Move...
++ * tests/gpgscm/gnupg.scm: ... to this new file.
++ * tests/gpgscm/main.c (main): Load the new file.
++
++2017-04-11 NIIBE Yutaka <gniibe at fsij.org>
++
++ dirmngr: Fix build for Windows.
++ + commit 3133402241167ccad70fa888a47ffcbe04e7b4c5
++ * dirmngr/ldap-wrapper-ce.c (outstream_cookie_writer): Use
++ gpgrt_ssize_t.
++
++ g10,tools: Fix bzlib.h include order.
++ + commit 03d77b60befa4e2f8437a80ac429cca3e54688f8
++ * g10/compress-bz2.c: Include bzlib.h after gcrypt.h.
++ * tools/gpgsplit.c: Likewise.
++
++ g10: Minor clean up for TOFU.
++ + commit f079822b2ce06c18b7ea45efed2d29b54e38f04d
++ * g10/tofu.c (ask_about_binding): Fix for qualifier.
++
++ common: Portability fix for logging.c.
++ + commit 456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2
++ * common/logging.c (S_IRGRP, S_IWGRP, S_IROTH, S_IWOTH): Avoid
++ duplicated definition.
++
++ tools: Portability fix for gpgparsemail.
++ + commit a1446163d584cdc3003c7d5b5fc6d74737c1732d
++ * tools/rfc822parse.c (my_stpcpy): Rename from stpcpy.
++
++2017-04-10 Justus Winter <justus at g10code.com>
++
++ gpgscm: Fix opcode dispatch.
++ + commit 1b6adab41d386b587f65e5c6f14a63859ac1226b
++ * tests/gpgscm/scheme.c (opexe_0): Consider 'op', not 'sc->op'. The
++ former is the opcode we are currently executing.
++
++ gpgscm: Mmap script files.
++ + commit c7f0d90592fd0348a3818ac897f91e6859584146
++ * tests/gpgscm/main.c (load): Try to mmap the script.
++ * tests/gpgscm/scheme.c (scheme_load_memory): New function, a
++ generalization of 'scheme_load_string'.
++ * tests/gpgscm/scheme.h (scheme_load_memory): New prototype.
++
++ gpgscm: Refactor checking for opcode arguments.
++ + commit f3d1f6867792deeb9a2a63744ee9b076c41c58f3
++ * tests/gpgscm/scheme.c (op_code_info): Fix type, add forward
++ declaration.
++ (check_arguments): New function.
++ (Eval_cycle): Use the new function.
++
++ gpgscm: Improve syntax dispatch.
++ + commit b628e62b5b9f7ed5cbb1bfe34727b5ee8129f7d4
++ * tests/gpgscm/scheme.c (assign_syntax): Add opcode parameter, store
++ opcode in the tag.
++ (syntaxnum): Add sc parameter, retrieve opcode from tag.
++ (opexe_0): Adapt callsite.
++ (scheme_init_custom_alloc): Likewise.
++
++ gpgscm: Make tags mandatory.
++ + commit a1ad5d6a30cf72d9b7e7bb449985dc69d5e01c4b
++ * tests/gpgscm/opdefines.h: Make tags mandatory.
++ * tests/gpgscm/scheme.c: Likewise.
++ * tests/gpgscm/scheme.h: Likewise.
++
++ gpgscm: Add and use opcode for reversing a list in place.
++ + commit e1bb9326dc381ae2711a81ab621e21a66388bcbd
++ * tests/gpgscm/lib.scm (string-split-pln): Use 'reverse!'.
++ (string-rtrim): Likewise.
++ * tests/gpgscm/opdefines.h (reverse!): New opcode.
++ * tests/gpgscm/scheme.c (opexe_0): Handle new opcode.
++
++ gpgscm: Deduplicate code.
++ + commit 3e91019a92b9bb3bb5a8cd62336b4cf65964e45b
++ * tests/gpgscm/scheme.c (oblist_add_by_name): Deduplicate.
++ (new_slot_spec_in_env): Likewise.
++
++ gpgscm: Move dispatch table into rodata.
++ + commit 7dff6248bddd5583988ac562318cf0d76a409d0e
++ * tests/gpgscm/opdefines.h: Use 0 instead of NULL.
++ * tests/gpgscm/scheme.c (op_code_info): Use char arrays instead of
++ pointers, make arity parameters smaller.
++ (INF_ARG): Adapt.
++ (_OP_DEF): Likewise.
++ (dispatch_table): Likewise.
++ (procname): Likewise.
++ (Eval_cycle): Likewise.
++ (scheme_init_custom_alloc): Likewise.
++
++ gpgscm: Use more threaded code.
++ + commit 6f217d116d1a12c6093bb253dbfa349bc81bc90b
++ * tests/gpgscm/scheme.c (opexe_0): Use 's_thread_to' instead of
++ 's_goto' wherever possible.
++
++ gpgscm: Remove now obsolete dispatcher function from the opcodes.
++ + commit e7ed9822e20ee4bbb4cdd9eca8121b4ade87e5ce
++ * tests/gpgscm/opdefines.h: Remove now obsolete dispatcher function
++ from the opcodes.
++ * tests/gpgscm/scheme-private.h (_OP_DEF): Adapt.
++ * tests/gpgscm/scheme.c (dispatch_func): Remove type declaration.
++ (op_code_info): Remove 'func'.
++ (_OP_DEF): Adapt.
++ (Eval_Cycle): Always call 'opexe_0'.
++
++ gpgscm: Merge 'opexe_6'.
++ + commit ddf444828b9b3f75d964473a2c0e77f75f094cf4
++ * tests/gpgscm/scheme.c (opexe_6): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++ gpgscm: Merge 'opexe_5'.
++ + commit 1379df44537b67b7c2fbc0fb5bc6f7945a5d7ebb
++ * tests/gpgscm/scheme.c (opexe_5): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++ gpgscm: Merge 'opexe_4'.
++ + commit 4f835104b9475e7d585d859b85e7d0d4cfe9aab3
++ * tests/gpgscm/scheme.c (opexe_4): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++ gpgscm: Merge 'opexe_3'.
++ + commit d591ab65d37ee467ca91ad851ab236f2985c1ee2
++ * tests/gpgscm/scheme.c (opexe_3): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++ gpgscm: Merge 'opexe_2'.
++ + commit 6cad38228f6ebfdc8e52960223b492597aff26a0
++ * tests/gpgscm/scheme.c (opexe_2): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++ gpgscm: Merge 'opexe_1'.
++ + commit 154af876f05b773bf3a860fcb4cc41066da27beb
++ * tests/gpgscm/scheme.c (opexe_1): Merge into 'opexe_0'.
++ * tests/gpgscm/opdefines.h: Adapt.
++
++2017-04-10 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Use "ll" length specifier when time_t is larger.
++ + commit 170660ed11b56145dea4865e751ae5aff1681fe2
++ * agent/command.c (cmd_keytocard): Use KEYTOCARD_TIMESTAMP_FORMAT.
++
++ scd: Relax a condition for p15 driver.
++ + commit 7501f2e9c4e6fd94a191b381d52ec2fe1d103e29
++ * scd/app-p15.c (read_ef_aodf): Fix.
++
++ scd: Relax a condition for p15 driver.
++ + commit 3c1ad96f1ce838daf2d861b33e6611f6d3043d25
++ * scd/app-p15.c (read_ef_aodf): Remove possibly redundant condition.
++
++ scd: Remove "special transport" support.
++ + commit 34199ef677bb40eadf0da696a111f7036bc3187e
++ * scd/ccid-driver.c (transports, my_sleep, prepare_special_transport)
++ (writen): Remove.
++ (ccid_dev_scan, ccid_dev_scan_finish, ccid_get_BAI): Only for USB.
++ (ccid_open_reader, do_close_reader, bulk_out, bulk_in, abort_cmd)
++ (ccid_poll, ccid_transceive): Likewise.
++
++2017-04-07 Justus Winter <justus at g10code.com>
++
++ gpgscm: Allocate small integers in the rodata section.
++ + commit 8640fa880d7050917f4729f2c0cb506e165ee446
++ * tests/gpgscm/Makefile.am (gpgscm_SOURCES): Add new file.
++ * tests/gpgscm/scheme-private.h (struct cell): Move number to the top
++ of the union so that we can initialize it.
++ (struct scheme): Remove 'integer_segment'.
++ * tests/gpgscm/scheme.c (initialize_small_integers): Remove function.
++ (small_integers): New variable.
++ (MAX_SMALL_INTEGER): Compute.
++ (mk_small_integer): Adapt.
++ (mark): Avoid marking objects already marked. This allows us to run
++ the algorithm over objects in the rodata section if they are already
++ marked.
++ (scheme_init_custom_alloc): Remove initialization.
++ (scheme_deinit): Remove deallocation.
++ * tests/gpgscm/small-integers.h: New file.
++
++ gpgscm: Make global data constant when possible.
++ + commit c9c3fe883271868d3b2dd287d295cf6a8f8ffc05
++ * tests/gpgscm/scheme-private.h (struct scheme): Make 'vptr' const.
++ * tests/gpgscm/scheme.c (num_zero): Statically initialize and turn
++ into constant.
++ (num_one): Likewise.
++ (charnames): Change type so that it can be stored in rodata.
++ (is_ascii_name): Adapt slightly.
++ (assign_proc): Make argument const char *.
++ (op_code_info): Make some fields const char *.
++ (tests): Make const.
++ (dispatch_table): Make const. At least it can be made read-only after
++ relocation.
++ (Eval_Cycle): Adapt slightly.
++ (vtbl): Make const.
++
++ gpgscm: Remove arbitrary limit on number of cell segments.
++ + commit 56638c28adc1bbe9fc052b92549a50935c0fe99c
++ * tests/gpgscm/scheme-private.h (struct scheme): Remove fixed-size
++ arrays for cell segments, replace them with a pointer to the new
++ 'struct cell_segment' instead.
++ * tests/gpgscm/scheme.c (struct cell_segment): New definition.
++ (_alloc_cellseg): Allocate the header within the segment, return a
++ pointer to the header.
++ (_dealloc_cellseg): New function.
++ (alloc_cellseg): Insert the segments into a list.
++ (_get_cell): Allocate a new segment if less than a quarter of
++ CELL_SIGSIZE is recovered during garbage collection.
++ (initialize_small_integers): Adapt callsite.
++ (gc): Walk the list of segments.
++ (scheme_init_custom_alloc): Remove initialization of removed field.
++ (scheme_deinit): Adapt deallocation.
++
++ gpgscm: Fix compact vector encoding.
++ + commit bf8b5e9042b3d86d419b2ac1987a9298c9d21500
++ * tests/gpgscm/scheme-private.h (struct cell): Use uintptr_t for
++ '_flags'. This way, '_flags' has the size of a machine word.
++
++2017-04-07 Werner Koch <wk at gnupg.org>
++
++ gpg: Fix printing of offline taken subkey.
++ + commit 547bc01d57528ecc27b3b5e16797967a7f88fecf
++ * g10/keylist.c (list_keyblock_print): Set SECRET to 2 and not 0x32.
++
++2017-04-07 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Internal CCID reader cleanup.
++ + commit cc420d34880e2a050b39f969873974cfc35fa5c3
++ * scd/ccid-reader.c (scan_usb_device): Only for scan mode, so, rename
++ from scan_or_find_usb_device.
++ (scan_devices): Likewise. Remove support of special transport types.
++ (ccid_get_reader_list): Simplify.
++ (abort_cmd): Fix error return.
++ (send_escape_cmd): Fix for RESULTLEN == NULL.
++ (ccid_transceive_secure): Remove unnecessary var updates.
++
++ scd: Don't keep CCID reader open when card is not available.
++ + commit 3c93595d701c59cbc9b67a7fd0bcde7ee0fada1a
++ * scd/apdu.c (open_ccid_reader): Fail if no ATR.
++
++ agent: Serialize access to passphrase cache.
++ + commit ebe12be034f052cdec871f0d8ad1bfab85d7b943
++ * agent/cache.c (encryption_lock): Remove.
++ (cache_lock): New. Now, we have coarse grain lock to serialize
++ entire cache access.
++ (initialize_module_cache): Use CACHE_LOCK.
++ (init_encryption, new_data): Remove ENCRYPTION_LOCK.
++ (agent_flush_cache, agent_put_cache, agent_get_cache): Lock the cache.
++
++2017-04-06 Justus Winter <justus at g10code.com>
++
++ gpgscm: Avoid mutating integer.
++ + commit f1dc34f502a68673e7a29f3fcf57b8dc6a4fac89
++ * tests/gpgscm/scheme.c (opexe_5): Do not modify the integer in-place
++ while printing an vector. Integer objects may be shared, so they must
++ not be mutated.
++
++ gpgscm: Initialize unused slots in vectors.
++ + commit b83903f59ec5d49ac579f263da70ebc8dc3645b5
++ * tests/gpgscm/scheme.c (get_vector_object): Initialize unused slots
++ at the end of vectors.
++
++ tests: Fix distcheck.
++ + commit 23f00f109ddba595db4f73a6182750177c7dd75d
++ * tests/Makefile.am (SUBDIRS): Add 'pkits' again. Simply dropping it
++ makes 'make distcheck' unhappy.
++ * tests/pkits/Makefile.am (TESTS): Remove all tests.
++
++ tests: Disable 'pkits' test suite.
++ + commit af1c1a57e46a00a32d83c1a58c5f3ef6f4a1c1d1
++ * tests/Makefile.am (SUBDIRS): Drop 'pkits'.
++ * tests/pkits/common.sh: Fix locating 'PKITS_data.tar.bz2'.
++ * tests/pkits/inittests: Likewise.
++
++ tests: Make test more robust.
++ + commit 94645311f8a3e9ae33643512f87fbef41bf0556f
++ * tests/openpgp/4gb-packet.scm: Skip if we do not have BZIP2.
++ * tests/openpgp/defs.scm (have-compression-algo?): New function.
++
++2017-04-05 Justus Winter <justus at g10code.com>
++
++ tests: Fix setup of ephemeral home directories.
++ + commit 01e84d429aeeb1450012ff0576a6a24de50693c6
++ * tests/openpgp/defs.scm (with-ephemeral-home-directory): Set
++ GNUPGHOME and cwd to the ephemeral directory before calling the setup
++ function.
++
++2017-04-04 Justus Winter <justus at g10code.com>
++
++ tests: Fix setup of ephemeral home directories.
++ + commit 32b75fb7743f35936d7014fce33c90ba97dfa374
++ * tests/openpgp/defs.scm (with-ephemeral-home-directory): Create
++ configuration files when we enter the context.
++ * tests/openpgp/setup.scm: Do not use an ephemeral home directory.
++ Tests should always use the cwd.
++ * tests/gpgsm/setup.scm: Likewise.
++ * tests/gpgsm/export.scm: Add explicit constructor function.
++ * tests/openpgp/decrypt-session-key.scm: Likewise.
++ * tests/openpgp/decrypt-unwrap-verify.scm: Likewise.
++
++ gpgscm: Fix copying values.
++ + commit 6261611d3786f19fd84ccc79f45a89cadac518e8
++ * tests/gpgscm/scheme.c (copy_value): New function.
++ (mk_tagged_value): Use new function.
++ (opexe_4): Likewise for OP_SAVE_FORCED.
++
++ gpgscm: Simplify get-output-string operation.
++ + commit a80d4a9b50ad47eae1f8c740dd73804311e38783
++ * tests/gpgscm/scheme.c (opexe_4): Simplify 'get-output-string'.
++
++ gpgscm: Simplify substring operation.
++ + commit d858096c99705ccf2e115475f81c4cf88edbeebf
++ * tests/gpgscm/scheme.c (opexe_2): Simplify 'substring'.
++
++2017-04-04 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Minor fix for get_client_pid.
++ + commit 5744d2038bd17b8b1be4e73d0ad3bc41772efe96
++ * agent/command-ssh.c (get_client_pid): Use 0 to initialize.
++
+2017-04-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.20.
+ + commit e7eb9b12deaf7ebe26967bfb56e980b7efeebdc3
+
+
+ dirmngr: New option --disable-ipv6.
+ + commit 3533b854408fa93734742b2ee12b62aa0d55ff28
+ * dirmngr/dirmngr.h (struct opt): Add field 'disable_ipv6'.
+ * dirmngr/dirmngr.c (oDisableIPv6): New const.
+ (opts): New option --disable-ipv6.
+ (parse_rereadable_options): Set that option.
+ * dirmngr/dns-stuff.c (opt_disable_ipv6): New var.
+ (set_dns_disable_ipv6): New.
+ (resolve_name_standard): Make use of it.
+ * dirmngr/ks-engine-finger.c (ks_finger_fetch): Take care of
+ OPT.DISABLE_IPV6.
+ * dirmngr/ks-engine-hkp.c (map_host): Ditto.
+ (send_request): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto.
+
+ dirmngr,w32: Silence the 'certificate already cached' message.
+ + commit fce36d7ec87be14b874813db277781c87a64ea87
+ * dirmngr/certcache.c (load_certs_from_w32_store): Silenece an info
+ message.
+
+ dirmngr: Handle EIO which is sometimes returned by cookie functions.
+ + commit cc32ddbcba8c53d3e2cad952d72f62dc73911042
+ * dirmngr/ks-engine-hkp.c (handle_send_request_error): Handle EIO.
+
+ dirmngr: Always print a warning for a missing /etc/hosts.
+ + commit 35c843c815306f36d1efbc52f5e2f6bac3f67aec
+ * dirmngr/dns-stuff.c (libdns_init): No Windows specific handling of a
+ missing /etc/hosts.
+
+ dirmngr: Do not assume that /etc/hosts exists.
+ + commit 5d873f288e86edfb684f4dd57ac36466b06494a4
+ * dirmngr/dns-stuff.c (libdns_init): Do not bail out.
+
+ po: Update the German translation.
+ + commit c7be01dae914c183dd99bd531a388c794d858c61
+
+
+ gpgconf: Add --enable-extended-key-format for the agent.
+ + commit d23052b04ebb0ac731aa351650c4084f080c640b
+ * tools/gpgconf-conf.c: Add option.
+ * agent/gpg-agent.c (main) <aGPGConfList>: Add option.
+
+2017-04-03 Justus Winter <justus at g10code.com>
+
+ gpgscm: Slightly improve the procedure dispatch.
+ + commit 90932bdad607d06f4f040e3457caddba79ba8b7e
+ * tests/gpgscm/scheme.c (procnum): Procedures always have an integer
+ number, so we can safely use the cheaper 'ivalue_unchecked'.
+
+2017-04-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Handle critical marked 'Reason for Revocation'.
+ + commit 3f6d949011f485613bb4bd3e06a2643be79cce40
+ * g10/parse-packet.c (can_handle_critical): Add
+ SIGSUBPKT_REVOC_REASON.
+
+2017-04-02 Werner Koch <wk at gnupg.org>
+
+ agent: Use OCB for key protection with --enable-extended-key-format.
+ + commit d24375271b97e45deaeb1ef0a8434c64066ba2e8
+ * agent/protect.c (PROT_DEFAULT_TO_OCB): Remove macro.
+ (agent_protect): Make the default protection mode depend on the extend
+ key format option.
+
+2017-04-01 Werner Koch <wk at gnupg.org>
+
+ kbx: Unify blob reading functions.
+ + commit 0039d7107bcdfce6f3b02b46ff0495cfba07882a
+ * kbx/keybox-file.c (_keybox_read_blob): Remove.
+ (_keybox_read_blob2): Rename to ....
+ (_keybox_read_blob): this. Make arg options. Change all callers.
+ * kbx/keybox-search.c (keybox_search): Factor fopen call out to ...
+ (open_file): new.
+ (keybox_seek): Als use open_file.
+
+2017-03-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid multiple open calls to the keybox file.
+ + commit 5556eca5acd46983bff0b38a1ffbc2f07fbaba9f
+ * g10/keydb.h (KEYDB_HANDLE): Move typedef to ...
+ * g10/gpg.h: here.
+ (struct server_control_s): Add field 'cached_getkey_kdb'.
+ * g10/gpg.c (gpg_deinit_default_ctrl): Release that keydb handle.
+ * g10/getkey.c (getkey_end): Cache keydb handle.
+ (get_pubkey): Use cached keydb handle.
+ * kbx/keybox-search.c (keybox_search_reset): Use lseek instead of
+ closing the file.
+
+ gpg: Pass CTRL also to getkey_end.
+ + commit aca5f494a88776d4974bfa9b0b65cb60c1b42040
+ * g10/getkey.c (getkey_end): Add arg CTRL. Change all callers.
+
+ gpg: Print more stats for the keydb and the signature cache.
+ + commit 3a10de3bfd785aefb0150e82b6dbbc7cb9f208c8
+ * g10/sig-check.c (sig_check_dump_stats): New.
+ (cache_stats): New struct.
+ (check_key_signature2): Update stats.
+ * g10/gpg.c (g10_exit): Call new function.
+ * g10/keydb.c (kid_not_found_cache_count): Replace by ...
+ (kid_not_found_stats): ... new struct. Change users.
+ (keydb_stats): New struct. Update the counters.
+ (keydb_dump_stats): Print all stats.
+
+ gpg: Assert that an opaque parameter is really what we expect.
+ + commit 52ba5e67cad4311d0ddbc4f2979e20afd0161d1f
+ * g10/gpg.h (SERVER_CONTROL_MAGIC): New const.
+ (server_control_s): Add field 'magic'.
+ * g10/gpg.c (gpg_init_default_ctrl): Init MAGIC.
+ * g10/import.c (impex_filter_getval): Assert MAGIC.
+
+2017-03-30 Justus Winter <justus at g10code.com>
+
+ gpg: Consistent use of preprocessor conditionals.
+ + commit 5e89144cbca36c1e7eb814b3aad4b7c46cd4efbf
+ * g10/parse-packet.c: Use '#if' instead of '#ifdef' when checking
+ DEBUG_PARSE_PACKET. This fixes the build with '#define
+ DEBUG_PARSE_PACKET 0'.
+
+ common: Avoid undefined behavior.
+ + commit 214fa9012296d796b78f1a3106d656639cf50aef
+ * common/iobuf.c (iobuf_read_line): Do not consider 'length' if
+ 'buffer' is NULL.
+
+2017-03-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove the use of the signature information from a KBX.
+ + commit a6142dbdbc5783043deb847dc64998c421860941
+ * g10/keydb.c (keyblock_cache): Remove field SIGSTATUS.
+ (keyblock_cache_clear): Adjust for that removal.
+ (parse_keyblock_image): Remove arg SIGSTATUS. Remove the signature
+ cache setting; this is now done in the parser.
+ (keydb_get_keyblock): Do not set SIGSTATUS.
+ (build_keyblock_image): Remove arg SIGSTATUS and simplify. Change
+ caller.
+ * kbx/keybox-blob.c: Explain that the signature information is not
+ anymore used.
+ (_keybox_create_openpgp_blob): Remove arg SIGSTATUS and change
+ callers.
+ * kbx/keybox-search.c (keybox_get_keyblock): Remove arg R_SIGSTATUS
+ and change callers.
+ * kbx/keybox-update.c (keybox_insert_keyblock): Likewise.
+
+ gpg: Fix actual leak and possible leaks in the packet parser.
+ + commit 7bf24e8146116a30c4c9d7b6dbf8bbb27fc35971
+ * g10/packet.h (struct parse_packet_ctx_s): Change LAST_PKT deom a
+ pointer to its struct.
+ (init_parse_packet): Adjust for LAST_PKT not being a pointer.
+ * g10/parse-packet.c (parse): Ditto. Free the last packet before
+ storing a new one in case of a deep link.
+ (parse_ring_trust): Adjust for LAST_PKT not being a pointer.
+ * g10/free-packet.c (free_packet): Ditto.
+ * g10/t-keydb-get-keyblock.c (do_test): Release keyblock.
+
+ gpg: Fix export porting of zero length user ID packets.
+ + commit 64665404e43051fa50ee030766347e24b7d1e4d5
+ * g10/build-packet.c (do_user_id): Avoid indeterminate length header.
+
+ gpg: Revamp reading and writing of ring trust packets.
+ + commit a8895c99a7d0750132477d80cd66caaf3a709113
+ * g10/parse-packet.c (parse_trust): Rename to ...
+ (parse_ring_trust): this. Change args and implement new ring trust
+ packet format.
+ (parse): Add special ring trust packet handling.
+ * g10/packet.h (PKT_user_id): New fields KEYUPDATE, UPDATEURL, and
+ KEYSRC.
+ (PKT_public_key): Ditto.
+ (RING_TRUST_SIG, RING_TRUST_KEY, RING_TRUST_UID): New consts.
+ (PKT_ring_trust): New.
+ (struct packet_struct): Remove member RING_TRUST.
+ (strcu parse_packet_ctx_s): Add field SKIP_META.
+ (init_parse_packet): Init SKIPT_META.
+ * g10/free-packet.c (release_public_key_parts): Free UDPATEURL.
+ (free_user_id): Ditto.
+ * g10/mainproc.c (list_node): Remove printing of non-documented "rtv"
+ lines.
+ * g10/build-packet.c (build_packet_and_meta): New.
+ (do_ring_trust): New.
+ * g10/export.c (write_keyblock_to_output): Use build_packet_and_meta
+ in backup mode.
+ (do_export_one_keyblock): Ditto.
+ * g10/import.c (read_block): Add arg WITH_META. Skip ring trust
+ packets if that ism not set.
+ (import): Call read_block WITH_META in restore mode.
+ * g10/keydb.h (KEYSRC_UNKNOWN, KEYSRC_FILE, KEYSRC_KS, KEYSRC_PREF_KS)
+ (KEYSRC_WKD, KEYSRC_WKD_SD, KEYSRC_DANE): New constants. They are not
+ yet used, though.
+ * g10/keydb.c (parse_keyblock_image): Allow ring trust packets.
+ (build_keyblock_image): Ditto. Use build_packet_and_meta.
+ * g10/keyring.c (keyring_get_keyblock): Remove specila treatment of
+ ring trust packets.
+ (write_keyblock): Use build_packet_and_meta. Remove special treatment
+ of ring trust packets and initialization of the signature caches.
+
+2017-03-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Extend free_packet to handle a packet parser context.
+ + commit afa86809087909a8ba2f9356588bf90cc923529c
+ * g10/packet.h (struct parse_packet_ctx_s): Add fields LAST_PKT and
+ FREE_LAST_PKT.
+ (init_parse_packet): Clear them.
+ (deinit_parse_packet): New macro. Change all users if
+ init_parse_packet to also call this macro.
+ * g10/free-packet.c (free_packet): Add arg PARSECTX and handle shallow
+ packet copies in the context. Change all callers.
+ * g10/parse-packet.c (parse): Store certain packets in the parse
+ context.
+
+ gpg: Change parse_packet to take a context.
+ + commit 0526c99164d3531b5ec763ffc672407eb24b2296
+ * g10/packet.h (struct parse_packet_ctx_s): New.
+ (parse_packet_ctx_t): New type.
+ (init_parse_packet): New macro.
+ * g10/parse-packet.c (parse_packet, dbg_parse_packet): Change to take
+ a parse context. Change all callers to provide a context instead of
+ directly supplying the input stream.
+ (search_packet, dbg_search_packet): Ditto.
+ (copy_all_packets, dbg_copy_all_packets): Init an use a parse context.
+ (copy_some_packets, dbg_copy_some_packets): Ditto.
+ (skip_some_packets, dbg_skip_some_packets): Ditto.
+
+ gpg: Export ring trust packets in backup mode.
+ + commit f5b565a5b8de3f2a3d98bc1a655e18333aee223b
+ * g10/export.c (write_keyblock_to_output): Export ring trust packets.
+
+2017-03-28 Justus Winter <justus at g10code.com>
+
+ tests,w32: Fix importing the extra key for GPGME's keylist test.
+ + commit b20780658ebb1e1245db18c04db3e815399cf706
+ * tests/gpgme/wrap.scm: Qualify the tests name with the extension for
+ executables (if any).
+
+2017-03-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Prepare for listing last_update and key origin data.
+ + commit 4af389c9721fa534ed06a64b80705b631575c775
+ * g10/keylist.c (list_keyblock_colon): Add empty fields 19 and 20.
+
+2017-03-28 Justus Winter <justus at g10code.com>
+
+ tests: Fix distcheck.
+ + commit 5128cd74c029d57491a79ca9e918c81facdf1b76
+ * tests/openpgp/Makefile.am (sample_msgs): Add all missing sample
+ messages.
+
+ tests: Add test for '--decrypt --unwrap'.
+ + commit 211d71f19c24da94f4c58014606125c1a29d86a2
+ * tests/openpgp/Makefile.am (XTESTS): Add new test.
+ * tests/openpgp/decrypt-unwrap-verify.scm: New file.
+
+ g10: Fix memory leak.
+ + commit 6d3edfd972c1114f43f6b35773dc25e0256f48f4
+ * g10/decrypt-data.c (decrypt_data): Free 'filename'.
+
+2017-03-27 Justus Winter <justus at g10code.com>
+
+ common: Fix connecting to the agent.
+ + commit caf00915532e6e8e509738962964edcd14fb0654
+ * common/homedir.c (_gnupg_socketdir_internal): Fix error handling.
+
+2017-03-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Support specifying SERIALNO for --card-status.
+ + commit c1e6302b347caf852a056b9c721469ccb51f44da
+ * g10/gpg.c (main): Allow an argument for --card-status.
+ * g10/card-util.c (current_card_status): Rename from card_status.
+ (card_status): New, which supports multiple cards.
+ (get_one_name): Use current_card_status.
+
+ scd: Change the order of applications when accessed.
+ + commit d58275703f035e8cfd58cd1c2d0d5ac7dc59e110
+ * scd/app.c (select_application): Move the app to top.
+
+ scd: Fix timeout handling for key generation.
+ + commit 0848cfcce738150b53bfb65b78efc1e6dc9f3d26
+ * scd/ccid-driver.c (CCID_CMD_TIMEOUT): Back to original value.
+ (CCID_CMD_TIMEOUT_LONGER): New.
+ (ccid_transceive): Add kludge for key generation.
+
+2017-03-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve check for already compressed packets.
+ + commit 0b3770c421a35b64823a805fa8d49ddd5c653d50
+ * common/miscellaneous.c (is_openpgp_compressed_packet): New.
+ (is_file_compressed): Rerad 2 more bytes and call new function.
+
+ agent: New option --enable-extended-key-format.
+ + commit 2c237c13628a88ba23742da34ea18d3e205d7c53
+ * agent/gpg-agent.c (oEnableExtendedKeyFormat): New const.
+ (opts): New option --enable-extended-key-format.
+ (parse_rereadable_options): Set option
+ * agent/findkey.c (write_extended_private_key): Add arg 'update'.
+ (agent_write_private_key): Implement new option.
+
+ agent: New option --stub-only for DELETE_KEY.
+ + commit 6fab7bba879d7794e32112cf3eddd8d87130a5d7
+ * agent/findkey.c (agent_delete_key): Add arg 'only_stubs'.
+ * agent/command.c (cmd_delete_key): Add option --stub-only.
+
+2017-03-23 Werner Koch <wk at gnupg.org>
+
+ common: Implicitly do a gpgconf --create-socketdir.
+ + commit 26086b362ff47d21b1abefaf674a6464bf0a8921
+ * common/homedir.c (_gnupg_socketdir_internal): Create the
+ sub-directory.
+
+ tests: Use gpgconf to stop the agent.
+ + commit 2c9d9ac55ea455a5ec26428989dced0311ed46cc
+ * tests/openpgp/defs.scm (stop-agent): Swap order of actions. Kill
+ all daemons using gpgconf.
+ * tools/gpgconf.c (main) <aRemoveSocketDir>: Try to remove known
+ socketfails on rmdir failure. Do no fail for ENONET.
+
+2017-03-23 Justus Winter <justus at g10code.com>
+
+ gpgscm: Make test cleanup more robust.
+ + commit 178b6314ab2d2268873067314744c8af74dc331e
+ * tests/gpgscm/tests.scm (mkdtemp-autoremove): New function that
+ cleans up at interpreter shutdown.
+ (run-tests-parallel): Use the new function.
+ (run-tests-sequential): Likewise.
+ (make-environment-cache): Execute setup with an temporary working
+ directory.
+
+2017-03-21 Justus Winter <justus at g10code.com>
+
+ tests: Test '--quick-set-primary-uid'.
+ + commit fde885bbc47a4bf14a8570ac62e68adc8cf47a6e
+ * tests/openpgp/quick-key-manipulation.scm: Test
+ '--quick-set-primary-uid'.
+
+ tests,w32: Use GetTempPath to get the path for temporary files.
+ + commit d17840c3f40111beaf97d96ad3ca52047976e221
+ * tests/gpgscm/ffi.c (do_get_temp_path): New function.
+ (ffi_init): Make function available.
+ * tests/gpgscm/tests.scm (mkdtemp): Use the new function.
+
+2017-03-21 Werner Koch <wk at gnupg.org>
+
+ gpg: New command --quick-set-primary-uid.
+ + commit 74c1f30ad6616186f0ab9dbaf34db6c17b1e40c4
+ * g10/gpg.c (aQuickSetPrimaryUid): New const.
+ (opts): New command --quick-set-primary-uid.
+ (main): Implement it.
+ * g10/keyedit.c (keyedit_quick_adduid): Factor some code out to ...
+ (quick_find_keyblock): new func.
+ (keyedit_quick_revuid): Use quick_find_keyblock.
+ (keyedit_quick_set_primary): New.
+
+2017-03-21 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix error handling.
+ + commit 483c1288a8f86dc6bf93d0d3f2865ecc246aecba
+ * dirmngr/dns-stuff.c (libdns_init): Convert error before printing it.
+
+ dirmngr: Load the hosts file into libdns.
+ + commit 88f1505f0613894d5544290a170119eb538921e5
+ * dirmngr/dns-stuff.c (libdns_init): Actually load the hosts file into
+ libdns.
+
+ tests: Create temporary directories in '/tmp'.
+ + commit 06f1f163e96f1039304fd3cf565cf9de1ca45849
+ * tests/gpgscm/tests.scm (mkdtemp): Create temporary directories in
+ '/tmp' on UNIX, or in '%Temp' on Windows.
+ * tests/migrations/common.scm (run-test): Turn error into a warning.
+ * tests/openpgp/defs.scm (start-agent): Likewise.
+
+2017-03-20 Justus Winter <justus at g10code.com>
+
+ tests: Remove debugging remnants.
+ + commit ceb4b245752bb1fb43fde7e99f8d904ab8a9b5e2
+ * tests/gpgme/gpgme-defs.scm (run-python-tests?): Remove 'trace's.
+
+ tests: Fail if we cannot create the socket directory.
+ + commit d75d20909d9f60d33ffd210def92278c0f383aad
+ * tests/migrations/common.scm (run-test): Turn warning into an error.
+ * tests/openpgp/defs.scm (start-agent): Likewise.
+
+2017-03-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Add new field no 18 to the colon listing.
+ + commit fe0b37e123ded51cc5f4cb5e3547fdfbce37a43e
+ * g10/misc.c (gnupg_pk_is_compliant): New.
+ * g10/keylist.c (print_compliance_flags): New.
+ (list_keyblock_colon): Call it here.
+ * sm/keylist.c (print_compliance_flags): New.
+ (list_cert_colon): Call it here.
+
+ gpg: Remove unused stuff.
+ + commit e2c63a13e2fa4ce39af8471a34c06d73ff3ee6f6
+ * g10/OPTIONS: Remove.
+ * g10/options.h (struct opt): Remove 'shm_coprocess'.
+
+2017-03-17 Neal H. Walfield <neal at g10code.com>
+
+ tests: Add test for issue 2959.
+ + commit fb9d68d636490ca88925051f48b08963c324aed1
+ * tests/openpgp/tofu.scm: Add test for --tofu-default-policy=ask.
+
+ gpg: Make sure the conflict set includes the current key.
+ + commit b1106b4d640325c60a7212a4a44e4f67c0e3312d
+ * g10/tofu.c (get_trust): Sanity check CONFLICT_SET after calling
+ get_policy. If POLICY is 'auto' and the default policy is 'ask', make
+ sure CONFLICT_SET includes the current key.
+
+2017-03-17 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Ignore warning alerts in the GNUTLS handshake.
+ + commit 69c521df422a6c9a6b0a93e45c9373a8b6ceb28e
+ * dirmngr/http.c (send_request) [GNUTLS]: Don't bail out on warning
+ alerts.
+
+2017-03-17 Justus Winter <justus at g10code.com>
+
+ gpgscm: Simplify hash tables.
+ + commit 6a3f857224eab108ae38e6259194b01b0ffdad8b
+ * tests/gpgscm/scheme.c (oblist_add_by_name): We now always get a
+ slot. Simplify accordingly.
+ (oblist_find_by_name): Always return the slot.
+ (vector_elem_slot): New function.
+ (new_slot_spec_in_env): We now always get a slot. Remove parameter
+ 'env'. Simplify accordingly.
+ (find_slot_spec_in_env): Always return a slot.
+ (new_slot_in_env): Adapt callsite.
+ (opexe_0): Likewise.
+ (opexe_1): Likewise.
+ (scheme_define): Likewise.
+
+ gpgscm: Remove framework for immediate values.
+ + commit 38c955599f7c6c20faeec57d8e1df7d2c0eeba18
+ * tests/gpgscm/scheme.c (IMMEDIATE_TAG): Remove macro.
+ (is_immediate): Likewise.
+ (set_immediate): Likewise.
+ (clr_immediate): Likewise.
+ (enum scheme_types): Set the LSB in every value.
+ (fill_vector): Adapt.
+ (vector_elem): Likewise.
+ (set_vector_elem): Likewise.
+ (mark): Likewise.
+ (gc): Test for the LSB to tell typeflags apart from pointers stored in
+ the same memory location.
+
+2017-03-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent,g10: Remove redundant SERIALNO request.
+ + commit 8c8ce8711d9c938fcb982b0341e6b052742cb887
+ * agent/learncard.c (agent_handle_learn): Don't call
+ agent_card_serialno. Get the serialno in status response.
+ * g10/call-agent.c (agent_scd_learn): Don't request "SCD SERIALNO".
+ (agent_scd_serialno): New.
+ (card_cardlist_cb, agent_scd_cardlist): New.
+
+2017-03-15 Justus Winter <justus at g10code.com>
+
+ tests: Fix using tools from the build directory.
+ + commit a98459d3f4ec3d196fb0adb0e90dadf40abc8c81
+ * tests/openpgp/defs.scm (gpg-conf'): Explicitly pass the build prefix
+ to gpgconf here...
+ (gpg-components): ... instead of only here.
+
+ tests: Dump the tools that the tests are going to use.
+ + commit c7833eca38fdb8d9ba7b59438ea87d651b8bf7ba
+ * tests/openpgp/setup.scm: Dump the tools that the tests are going to
+ use. This will help us diagnose problems with the tests picking the
+ wrong paths in the future.
+
+ build: Remove '--disable-tools' configuration option.
+ + commit 6993e42088c191f18468317ba2b5b8fbc8c3edff
+ * Makefile.am (SUBDIRS): Unconditionally include 'tools'.
+ * configure.ac: Remove '--disable-tools' configuration option.
+
+2017-03-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix check of serialno.
+ + commit 61785b679c542bbd789395fa632eb8b5133b01ad
+ * g10/card-util.c (card_status): Fix.
+
+ g10: Remove unused function.
+ + commit ed3248219e921ee24f6f1b2985abb7e0945d70e9
+ * g10/call-agent.c (select_openpgp): Remove.
+
+ tests: Fix running python condition.
+ + commit a672ddec03f96475866d712b28be18b3fab43aef
+ * tests/gpgme/gpgme-defs.scm (run-python-tests?): We need Python.
+
+2017-03-14 Justus Winter <justus at g10code.com>
+
+ tests: Skip Python tests if the bindings are not built.
+ + commit d82abbb1b6e80d5980e6259ddcfc770e65a6b1b3
+ * tests/gpgme/wrap.scm (python): Move variable...
+ * tests/gpgme/gpgme-defs.scm (python): ... here.
+ (run-python-tests?): New function.
+ * tests/gpgme/run-tests.scm: Only run Python tests if the bindings can
+ be located in GPGME's build directory.
+
+2017-03-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Flush stdout before printing stats with --check-sigs.
+ + commit 9a77b3b6e41f97b1209ad61c04b3dd33242ecae8
+ * g10/keylist.c (print_signature_stats): Flush stdout.
+ (list_keyblock_colon): Use es_flush instead of fflush.
+
+2017-03-09 Justus Winter <justus at g10code.com>
+
+ tests: Run the tests for the Python bindings of GPGME.
+ + commit 046a15a88c83b40a753b4ad7ecc1456efa5b527f
+ * tests/gpgme/gpgme-defs.scm (create-file): Write lines.
+ (create-gpgmehome): Extend function to create the right environment
+ for the Python tests.
+ * tests/gpgme/run-tests.scm: Make an environment cache for the Python
+ tests and enable them.
+ * tests/gpgme/wrap.scm: Do not hardcode the path of the Python
+ interpreter.
+
+ tests: Rework environment setup.
+ + commit cca91a3f8f7e3e36b7149fc93f7b6df11d21eb1d
+ * tests/gpgscm/tests.scm (test::scm): Add a setup argument.
+ (test::binary): Likewise.
+ (run-tests-parallel): Remove setup parameter.
+ (run-tests-sequential): Likewise.
+ (make-environment-cache): New function that handles the cache
+ protocol.
+ * tests/gpgme/run-tests.scm: Adapt accordingly.
+ * tests/gpgsm/run-tests.scm: Likewise.
+ * tests/migrations/run-tests.scm: Likewise.
+ * tests/openpgp/run-tests.scm: Likewise.
+
+2017-03-08 Werner Koch <wk at gnupg.org>
+
+ wks: Put stdout into binary mode for Windows at another place.
+ + commit ed5575ec550ff16b0b901a23c6aa3eb3d47b0575
+ * tools/wks-util.c (wks_send_mime): Set stdout to binary.
+
+ wks: Put stdout into binary mode for Windows.
+ + commit 5c83759364272b19ceafbef46d057f0430a12698
+ * tools/send-mail.c (send_mail_to_file): Call es_set_binary.
+
+2017-03-08 Justus Winter <justus at g10code.com>
+
+ build: Use macOS' compatibility macros to enable all features.
+ + commit dd60e868d2bf649a33dc96e207ffd3b8ae4d35af
+ * configure.ac: On macOS, use the compatibility macros to expose every
+ feature of the libc. This is the equivalent of _GNU_SOURCE on GNU
+ libc.
+
+ g10: Move more flags into the flag bitfield.
+ + commit 2649fdfff5d9e227025956e015b67502fd4962c4
+ * g10/packet.h (PKT_user_id): Move 'is_primary', 'is_revoked', and
+ 'is_expired' into the flags bitfield, and drop the prefix.
+ * g10/call-dirmngr.c: Adapt accordingly.
+ * g10/export.c: Likewise.
+ * g10/getkey.c: Likewise.
+ * g10/import.c: Likewise.
+ * g10/kbnode.c: Likewise.
+ * g10/keyedit.c: Likewise.
+ * g10/keylist.c: Likewise.
+ * g10/keyserver.c: Likewise.
+ * g10/mainproc.c: Likewise.
+ * g10/pkclist.c: Likewise.
+ * g10/pubkey-enc.c: Likewise.
+ * g10/tofu.c: Likewise.
+ * g10/trust.c: Likewise.
+ * g10/trustdb.c: Likewise.
+
+2017-03-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Do not put a keyserver into a new dirmngr.conf.
+ + commit 8f028642239fa992c6c059e3c1b4421a1813c827
+ * g10/dirmngr-conf.skel: Do not define keyservers.
+
+ doc: Add a note to the trust model direct.
+ + commit f0257b4a86b73f5b956028e68590b6d2a23ea4da
+ * doc/gpg.texi (GPG Configuration Options): Add note. Chnage Index
+ from trust-mode:foo to trust-model:foo.
+
+2017-03-07 Justus Winter <justus at g10code.com>
+
+ Revert "build: Improve CFLAGS handling."
+ + commit b71384c8054ce2f245ccfae02b8ee81e1adfc512
+ This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.
+
+ build: Improve CFLAGS handling.
+ + commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4
+ * configure.ac: Strip any flags matching '-Werror' from CFLAGS before
+ running the tests, and add them back later on.
+
+2017-03-07 Michael Haubenwallner <michael.haubenwallner at ssi-schaefer.com>
+
+ gpgscm: Use system strlwr if available.
+ + commit c22a2a89d3bd3d08b3abb8e4e33df32b480338ec
+ * tests/gpgscm/scheme.c: Define local strlwr only when HAVE_STRLWR is
+ not defined in config.h.
+ * tests/gpgscm/scheme-config.h: Remove hack.
+
+2017-03-07 Justus Winter <justus at g10code.com>
+
+ gpg: Do not allow the user to revoke the last valid UID.
+ + commit 591b6a9d879cbcabb089d89a26d3c3e0306054e1
+ * g10/keyedit.c (keyedit_quick_revuid): Merge self signatures, then
+ make sure that we do not revoke the last valid UID.
+ (menu_revuid): Make sure that we do not revoke the last valid UID.
+ * tests/openpgp/quick-key-manipulation.scm: Demonstrate that
+ '--quick-revoke-uid' can not be used to revoke the last valid UID.
+
+2017-03-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ tools: Removal of -Icommon.
+ + commit 80fb1a8a05b2194af16027555b09bbd5d48ec9ac
+ * tools/gpg-wks-server.c: Follow the change.
+
+ More change for common.
+ + commit d6c7bf1f8ab8899faba2fb81a35b096921c38f3c
+ * g10, scd, test, tools: Follow the change of removal of -Icommon.
+
+ Remove -I option to common.
+ + commit 70aca95d6816082b289fceca8eabfcf718a6b701
+ * dirmngr/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
+ * g10/Makefile.am (AM_CPPFLAGS): Ditto.
+ * g13/Makefile.am (AM_CPPFLAGS): Ditto.
+ * kbx/Makefile.am (AM_CPPFLAGS): Ditto.
+ * scd/Makefile.am (AM_CPPFLAGS): Ditto.
+ * sm/Makefile.am (AM_CPPFLAGS): Ditto.
+ * tools/Makefile.am (AM_CPPFLAGS): Ditto.
+ * Throughout: Follow the change.
+
+2017-03-07 Justus Winter <justus at g10code.com>
+
+ tests: Avoid overflowing signed 32 bit time_t.
+ + commit de3838372ae3cdecbd83eea2c53c8e2656d93052
+ * tests/openpgp/quick-key-manipulation.scm: Use expiration times in
+ the year 2038 instead of 2105 to avoid overflowing 32 bit time_t.
+ time_t is used internally to parse the expiraton time from the iso
+ timestamp.
+
+2017-03-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Resolve conflict of util.h.
+ + commit 176e07ce10d892fa7c7b96725b38b2fec9a1f916
+ * agent/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
+ * agent/call-pinentry.c, agent/call-scd.c: Follow the change.
+ * agent/command-ssh.c, agent/command.c, agent/cvt-openpgp.c: Ditto.
+ * agent/divert-scd.c, agent/findkey.c, agent/genkey.c: Ditto.
+ * agent/gpg-agent.c, agent/pksign.c, agent/preset-passphrase.c: Ditto.
+ * agent/protect-tool.c, agent/protect.c, agent/trustlist.c: Ditto.
+ * agent/w32main.c: Ditto.
+
+ agent: Add include files.
+ + commit bf03925751abb739f2fd9d631694d3dd33decf92
+ * agent/command-ssh.c: Add sys/socket.h and sys/un.h.
+
+ agent: Fix get_client_pid for portability.
+ + commit f7f806afa5083617f4aba02fc3b285b06a7d73d4
+ * configure.ac: Simply check getpeerucred and ucred.h, and structure
+ members.
+ * agent/command-ssh.c: Include ucred.h.
+ (get_client_pid) [HAVE_STRUCT_SOCKPEERCRED_PID]: Use sockpeercred
+ structure for OpenBSD.
+ [LOCAL_PEERPID]: Use LOCAL_PEERPID for macOS.
+ [LOCAL_PEEREID]: Use LOCAL_PEEREID for NetBSD.
+ [HAVE_GETPEERUCRED]: Use getpeerucred for OpenSolaris.
+
+ common: Fix warning for portability.
+ + commit b9ab733fc0dd2ca2a7eaac0bde3a817c07af36c5
+ * common/localename.c (do_nl_locale_name): We don't use CATEGORY.
+
+ tools: More portable for openpty use.
+ + commit ce37ada87139ef418401f9f35439007a8c04a856
+ * configure.ac (AC_CHECK_HEADERS): Add util.h libutil.h and termios.h.
+ * tools/symcryptrun.c: Include those headers.
+
+ scd: Close THE_EVENT handle.
+ + commit cc933a96f8e83bc66fb69ed33d9593acdd60c929
+ * scd/scdaemon.c (handle_connections): Close the handle.
+
+2017-03-06 Justus Winter <justus at g10code.com>
+
+ tests: Harmonize temporary and socket directory handling.
+ + commit 7e19786a5ddef637d1d9d21593fecf5a36b6f372
+ * tests/gpgscm/tests.scm (mkdtemp): Do not magically obey the
+ environment variable 'TMP', make sure to always return an absolute
+ path.
+ * tests/gpgme/Makefile.am (TMP): Drop variable.
+ (TESTS_ENVIRONMENT): Drop 'TMP'.
+ * tests/gpgme/gpgme-defs.scm (create-gpgmehome): Start the agent. Do
+ not create private key store, the agent does that for us.
+ * tests/gpgsm/Makefile.am (TMP): Drop variable.
+ (TESTS_ENVIRONMENT): Drop 'TMP'.
+ * tests/gpgme/gpgme-defs.scm (create-gpgsmhome): Start the agent. Do
+ not create private key store, the agent does that for us.
+ * tests/migrations/Makefile.am (TMP): Drop variable.
+ (TESTS_ENVIRONMENT): Drop 'TMP'.
+ * tests/migrations/common.scm (gpgconf): New variable.
+ (run-test): Create and remove socket directory.
+ * tests/migrations/extended-pkf.scm (src-tarball): Remove variable.
+ (setup): Remove function.
+ (trigger-migration): Likewise.
+ Use 'run-test' to execute the test.
+ * tests/migrations/from-classic.scm (src-tarball): Remove variable.
+ (setup): Remove function.
+ Use 'run-test' to execute the tests.
+ * tests/openpgp/Makefile.am (TMP): Drop variable.
+ (TESTS_ENVIRONMENT): Drop 'TMP'.
+ * tests/openpgp/README: Do not mention 'TMP'.
+ * tests/openpgp/defs.scm (with-home-directory): New macro.
+ (create-legacy-gpghome): Do not create private key store, the agent
+ does that for us.
+ (start-agent): Make sure to terminate the right agent with 'atexit'.
+
+ gpgscm: Fix creation of temporary directories.
+ + commit 171e4314ebd3ff74af3dcdc8bd68e1100e8910ea
+ * tests/gpgscm/ffi.c (do_mkdtemp): Use a larger buffer for the
+ template.
+
+2017-03-06 Werner Koch <wk at gnupg.org>
+
+ wks: Set published keys world-readable.
+ + commit e3589110e01dc6ad04463351ec2ce17201556d09
+ * tools/gpg-wks-server.c (check_and_publish): Set the permissions.
+
+ gpg: Fix attempt to double free an UID structure.
+ + commit 4a130bbc2c2f4be6e8c6357512a943f435ade28f
+ * g10/getkey.c (get_best_pubkey_byname): Set released .UID to NULL.
+
+2017-03-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix compiler warnings for app-openpgp.c.
+ + commit e6ca015ae182a6dbb0466441efc17c99683e9375
+ * scd/app-openpgp.c (retrieve_key_material): Remove touching I.
+ (do_change_pin): Make sure going to leave if PINVALUE == 0.
+ (rsa_writekey): Emit simpler log.
+
+ scd: More cleanup of old code.
+ + commit 9bf39ed75ddbd35908bcd0996f55325ff801619a
+ * scd/app-dinsig.c (do_sign): Remove assignment to HASHALGO.
+ * scd/app-p15.c (parse_keyusage_flags): Remove assign to MASK.
+ (read_ef_aodf): Likewise.
+ (read_ef_cdf): Change the control to parse_error.
+ * scd/app-sc-hsm.c (parse_keyusage_flags): Remove assign to MASK.
+ (read_ef_prkd): Remove assign to S.
+ (read_ef_prkd): Check if PRKDF is not null.
+ (read_ef_cd): Likewise for CDF.
+
+ scd: Clean up old code.
+ + commit cb6337329d3c858c695a7e56e2fc31d9d50ca3fe
+ * scd/apdu.c (CT_init, CT_data, CT_close): Remove.
+ (ct_error_string, ct_activate_card, close_ct_reader, reset_ct_reader)
+ (ct_get_status, ct_send_apdu, open_ct_reader): Remove.
+ (new_reader_slot) [NEED_PCSC_WRAPPER]: Remove fd and pid handling.
+ (writen, readn): Remove.
+ (pcsc_get_status, pcsc_send_apdu, control_pcsc, close_pcsc_reader)
+ (reset_pcsc_reader, open_pcsc_reader): Only DIRECT version.
+ (apdu_open_one_reader): Remove CT_api handling.
+ (apdu_get_status_internal, send_le): Fix to stop warnings.
+
+ scd: Fix API of select_file/_path.
+ + commit 0703de01c8fbc417a99ecf8e950fc306b8c8ac9c
+ * scd/iso7816.c (iso7816_select_file, iso7816_select_path): Remove
+ unused arguments.
+ * scd/app-dinsig.c (do_readcert): Follow the change.
+ * scd/app-help.c (app_help_read_length_of_cert): Likewise.
+ * scd/app-nks.c (keygripstr_from_pk_file, do_readcert, do_readkey)
+ (switch_application): Likewise.
+ * scd/app-p15.c (select_and_read_binary, select_ef_by_path)
+ (micardo_mse, app_select_p15): Likewise.
+ * scd/app.c (app_new_register): Likewise.
+
+ agent: For SSH, robustly handling scdaemon's errors.
+ + commit 4ce4f2f683a17be3ddb93729f3f25014a97934ad
+ * agent/command-ssh.c (card_key_list): Return 0 when
+ agent_card_serialno returns an error.
+ (ssh_handler_request_identities): Handle errors for card listing
+ and proceed to other cases.
+
+2017-03-03 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix commit de6d8313.
+ + commit 67c203b6bf8d6dd489ceef3391f609986e7b7a49
+ * dirmngr/http-common.c (get_default_keyserver): Fix assert.
+
+2017-03-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix scd_kick_the_loop.
+ + commit f9acc7d18bb90f47dafe7e32ae92f567756d6b12
+ * scd/scdaemon.c (notify_fd): Remove.
+ (the_event) [W32]: New.
+ (main_thread_pid) [!W32]: New.
+ (handle_signal): Handle SIGCONT.
+ (scd_kick_the_loop): Use signal on UNIX and event on Windows.
+ (handle_connections): Likewise.
+
+2017-03-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix possible segv when attribute packets are filtered.
+ + commit 5f6f3f5cae8a95ed469129f9677782c17951dab3
+ * g10/import.c (impex_filter_getval): Handle PKT_ATTRIBUTE the same as
+ PKT_USER_ID
+ (apply_drop_sig_filter): Ditto.
+
+ gpg: Add new variables to the import and export filters.
+ + commit 1813f3be23bdab5a42070424c47cb8daa9d9e6b7
+ * g10/import.c (impex_filter_getval): Add new variables "expired",
+ "revoked", and "disabled".
+
+2017-03-02 Werner Koch <wk at gnupg.org>
+
+ tools: Fix compile error with older gcc versions.
+ + commit b1f48da02b474e985161aa2778d7b602a13c4292
+ * tools/mime-parser.h: Include rfc822parse.h.
+ (struct rfc822parse_context): Remove duplicate definition.
+
+ dirmngr: Rearrange files to fix de6d831.
+ + commit 1890896fe698c55d15160a53aa6c5c22dc424031
+ * dirmngr/http-common.c: New.
+ * dirmngr/http-common.h: New.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Add them.
+ (t_http_SOURCES): Add them.
+ (t_ldap_parse_uri_SOURCES): Add them.
+ * dirmngr/misc.c (get_default_keyserver): Move to ...
+ * dirmngr/http-common.c: here.
+ * dirmngr/http.c: Include http-common.h instead of misc.h.
+ * dirmngr/http-ntbtls.c: Ditto.
+
+ dirmngr: Let --gpgconf-list return the default keyserver.
+ + commit de6d8313f6df32aaa151bee74e1db269ac1e0fed
+ * dirmngr/misc.c (get_default_keyserver): New.
+ * dirmngr/http.c: Include misc.h
+ (http_session_new): Use get_default_keyserver instead of hardwired
+ "hkps.pool.sks-keyservers.net".
+ * dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
+ * dirmngr/dirmngr.c (main) <aGPGCongList>: Return default keyserver.
+
+2017-03-02 Justus Winter <justus at g10code.com>
+
+ gpg: Always initialize the trust db when generating keys.
+ + commit 0c4d0620d327e8a2069532a5519afefe867a47d6
+ * g10/gpg.c (main): Always initialize the trust db when generating
+ keys.
+ * g10/keygen.c (do_generate_keypair): We can now assume that there is
+ a trust db.
+
+ gpg: Fix (quick) key generation with --always-trust.
+ + commit 4735ab96aa5577d40ba7b3f72d863057198cc6a7
+ * g10/keygen.c (do_generate_keypair): Only update the ownertrust if we
+ do have a trust database.
+ * g10/trustdb.c (have_trustdb): New function.
+ * g10/trustdb.h (have_trustdb): New prototype.
+ * tests/openpgp/quick-key-manipulation.scm: Remove workaround.
+
+2017-03-02 Werner Koch <wk at gnupg.org>
+
+ agent: Improve error message for the KEYTOCARD command.
+ + commit d6f0f368763006abf08818bfefcd32ecedb5c20a
+ * agent/command.c (cmd_keytocard): Always use leave_cmd. Simplify
+ timestamp checking and do an early test with an appropriate error
+ message.
+
+2017-03-02 Justus Winter <justus at g10code.com>
+
+ g10: Signal an error when trying to revoke non-existant UID.
+ + commit 62d21a4ab4029b32ea129f1cf3a0e1f22e2fb7b0
+ * g10/keyedit.c (keyedit_quick_revuid): Signal an error when trying to
+ revoke non-existant UID.
+ * tests/openpgp/quick-key-manipulation.scm: Test that.
+
+ tests: Log information about ssh, add comments to test.
+ + commit 74cb3b230c1f99afc5fd09bccc24186a63b154b0
+ * tests/openpgp/ssh-import.scm (ssh-version-string): New variable, and
+ log the binary and version used in the test.
+ (ssh-supports?): Document how we test what algorithms are supported by
+ ssh, and log ssh-keygen's replies.
+
+ common,tools: Always escape newlines when escaping data.
+ + commit e064c75b08a523f738108428fe0c417a46e66238
+ * common/stringhelp.c (do_percent_escape): Always escape newlines.
+ * tools/gpgconf-comp.c (gc_percent_escape): Likewise.
+
+2017-03-01 Werner Koch <wk at gnupg.org>
+
+ 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.
+
+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 dfb6396,0000000..0ddcadb
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.20
++2.1.21
diff --cc doc/defsincdate
index 6f5bc9d,0000000..86b3aab
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1491245772
++1494517260
diff --cc po/ca.po
index 870daaf,950d95c..8e8c8e5
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -126,8 -108,6 +126,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -172,97 -144,68 +172,97 @@@ msgstr "l'MPI és erroni
msgid "Bad Passphrase"
msgstr "la contrasenya és errònia"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "canvia la contrasenya"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, 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"
@@@ -430,10 -342,6 +430,10 @@@ 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:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detall"
@@@ -548,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -568,36 -444,25 +568,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -644,15 -500,11 +644,15 @@@ msgstr "ha fallat l'actualització: %s\
msgid "listening on socket '%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: s'ha creat el directori\n"
@@@ -692,18 -537,14 +692,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -719,8 -558,6 +719,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -728,9 -565,6 +728,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -845,8 -660,6 +845,8 @@@ msgstr "
msgid "Yes"
msgstr "sí|si"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -897,19 -703,16 +897,19 @@@ msgstr "canvia la contrasenya
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "activa una clau"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1806,8 -1422,6 +1806,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -2102,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -2363,8 -1860,6 +2363,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2391,8 -1882,6 +2391,8 @@@ msgstr "clau %08lX: clau d'estil PGP 2.
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2403,8 -1891,6 +2403,8 @@@ msgstr "error en crear «%s»: %s\n
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcions d'importació no vàlides\n"
@@@ -2440,259 -1920,203 +2440,259 @@@ msgstr "error en crear «%s»: %s\n
msgid "No fingerprint"
msgstr "Empremta digital:"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "xifra dades"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "llista claus"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exporta claus"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exporta claus a un servidor de claus"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importa claus d'un servidor de claus"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "cerca claus en un servidor de claus"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importa/fon claus"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "no fa cap canvi"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2703,7 -2127,6 +2703,7 @@@ msgstr "
# Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
# en el manual original de PGP. A, B, C... ivb
# En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2733,13 -2156,11 +2733,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2759,7 -2180,6 +2759,7 @@@ msgstr "
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2767,554 -2187,438 +2767,554 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, 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:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "No és una adreça vàlida\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, 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:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, 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:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, 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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, 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:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 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:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
#, 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:3746
++#: g10/gpg.c:3749
#, 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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, 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:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
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:5280
++#: g10/gpg.c:5283
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:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3897,8 -3090,6 +3897,8 @@@ msgstr "[revocació]
msgid "[self-signature]"
msgstr "[autosignatura]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
@@@ -4730,15 -3761,10 +4730,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5720,19 -4567,16 +5720,19 @@@ msgstr " Empremta digital =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "s'està comprovant l'anell «%s»\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5740,7 -4584,6 +5740,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu clau actualitzades\n"
msgstr[1] "\t%lu clau actualitzades\n"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5750,7 -4593,6 +5750,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:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
@@@ -5845,7 -4668,6 +5845,7 @@@ msgstr "s'està sol·licitant la clau %
msgid "no keyserver known\n"
msgstr "error de servidor de claus"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "es descarta «%s»: %s\n"
@@@ -6151,32 -4912,26 +6151,32 @@@ msgstr "error de lectura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -6185,7 -4940,6 +6185,7 @@@ msgstr "AVÍS: %s és una opció desaco
# Gènere? Nombre? Passat, futur? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "No comprimit"
@@@ -6193,90 -4947,62 +6193,77 @@@
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "No comprimit"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "aquest missatge pot no ser usable per %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "El fitxer «%s» existeix. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: el sufix és desconegut\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Introduïu el nou nom del fitxer"
# Indi? ivb
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "s'està escrivint en stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "s'asumeix que hi ha dades signades en «%s»\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@@ -7102,22 -5679,18 +7089,22 @@@ msgstr "signatura:
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
"fals!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "es descarta «%s»: duplicat\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7209,7 -5766,6 +7196,7 @@@ msgid "%s: directory does not exist!\n
msgstr "%s: el directori no existeix!\n"
# No em passe! ;) ivb
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7357,10 -5885,6 +7344,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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7392,7 -5911,6 +7379,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7421,58 -5935,45 +7408,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "llista claus i ID"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "llista claus"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7480,68 -5981,58 +7463,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "xifrat amb %lu contrasenyes\n"
msgstr[1] "xifrat amb %lu contrasenyes\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fitxers]|imprimeix resums de missatges"
@@@ -7549,150 -6040,124 +7532,150 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
# Werner FIXME: use ngettext. jm
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "S'han esborrat %d signatures.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "xifrat amb %lu contrasenyes\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7709,18 -6174,14 +7692,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9939,8 -7955,6 +9922,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/cs.po
index 27d8c41,f0fe2d9..1881a1f
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -133,8 -115,6 +133,8 @@@ msgstr "PIN:
msgid "Passphrase:"
msgstr "Heslo:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "neshodují se – zkuste to znovu"
@@@ -174,62 -146,39 +174,62 @@@ msgstr "Špatný PIN
msgid "Bad Passphrase"
msgstr "Špatné heslo"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "nelze vytvořit „%s“: %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -238,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Povolit"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Zakázat"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Prosím, vložte toto heslo znovu"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -264,7 -208,6 +264,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
@@@ -422,10 -334,6 +422,10 @@@ msgstr "poběží v režimu serveru (n
msgid "run in supervised mode"
msgstr "pracovat v režimu serveru"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "upovídaný režim"
@@@ -525,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
@@@ -547,33 -423,22 +547,33 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "zadána neplatná úroveň ladění „%s“\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "soubor s možnostmi „%s“: %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
@@@ -619,14 -475,10 +619,14 @@@ msgstr "volání listen() selhalo: %s\n
msgid "listening on socket '%s'\n"
msgstr "naslouchá se na socketu „%s“\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "nelze vytvořit adresář „%s“: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "adresář „%s“ vytvořen\n"
@@@ -666,18 -511,14 +666,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "v této relaci neběží žádný gpg-agent\n"
@@@ -693,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -702,9 -539,6 +702,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -820,8 -635,6 +820,8 @@@ msgstr "
msgid "Yes"
msgstr "Ano"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Ne"
@@@ -872,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:1492
++#: agent/findkey.c:1490
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -880,11 -685,9 +880,11 @@@
msgstr ""
"Opravdu chcete smazat klíč určený pomocí keygripu%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Smazat klíč"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1698,8 -1314,6 +1698,8 @@@ msgstr "Chyba: URL je příliš dlouh�
msgid "error reading '%s': %s\n"
msgstr "chyba při čtení „%s“: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
@@@ -1978,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klíč „%s“ nenalezen: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
@@@ -2217,8 -1714,6 +2217,8 @@@ msgid " - skipped
msgstr " – přeskočeno"
# g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
@@@ -2241,8 -1732,6 +2241,8 @@@ msgstr "klíč %s: PGP 2.x klíč –
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2251,8 -1739,6 +2251,8 @@@
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(zkontrolujte argument volby „%s“)\n"
@@@ -2293,200 -1773,154 +2293,200 @@@ msgstr "chyba při získávání „%s�
msgid "No fingerprint"
msgstr "Chybí otisk"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný klíč „%s“ nenalezen: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "jako výchozí tajný klíč se použije „%s“\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "jako výchozí tajný klíč se použije „%s“\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "používám podklíč %s místo primárního klíče %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "vytvořit podpis"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "šifrovat data"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "vypsat seznam klíčů"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "vypsat seznam klíčů a podpisů"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "quickly add a new user-id"
msgid "quickly revoke a user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "odstranit klíč ze souboru tajných klíčů"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "rychle podepsat klíč"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "rychle lokálně podepsat klíč"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "podepsat klíč"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "podepsat klíč lokálně"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "změnit heslo"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportovat klíče"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportovat klíče na server klíčů"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importovat klíče ze serveru klíčů"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "vyhledat klíče na serveru klíčů"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "aktualizovat všechny klíče ze serveru klíčů"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importovat/sloučit klíče"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "vytisknout stav karty"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "změnit data na kartě"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "změnit PIN karty"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "aktualizovat databázi důvěry"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
#, fuzzy
#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
msgid "|VALUE|set the TOFU policy for a key"
@@@ -2494,43 -1928,33 +2494,43 @@@ msgstr "
"|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
"[špatný], ask [zeptat se], auto)"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "vyžádat potvrzení před přepsáním"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2538,7 -1962,6 +2538,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2566,11 -1989,9 +2566,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2580,7 -2001,6 +2580,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2588,78 -2008,63 +2588,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "použití: %s [přepínače] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nalezen v definici skupiny „%s“\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví konfiguračního souboru „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpečně\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROVÁNÍ: přístupová práva pro domovský adresář „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva pro konfigurační soubor „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpečná\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2667,21 -2072,18 +2667,21 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
"nastavena bezpečně\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2689,7 -2091,6 +2689,7 @@@ msgstr "
"VAROVÁNÍ: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
"nastavena bezpečně\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2697,442 -2098,345 +2697,442 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "ukazovat všechny poznámky během výpisu podpisů"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
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:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
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:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "ukazovat název souboru s klíči při výpisu klíčů"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámá TOFU politika „%s“\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(možnosti lze vypsat příkazem „help“)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
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:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
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:3248
++#: g10/gpg.c:3251
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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
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:3740
++#: g10/gpg.c:3743
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:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, 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:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@@ -3693,8 -2886,6 +3693,8 @@@ msgstr "[revokace]
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "chyba při alokování paměti: %s\n"
@@@ -4463,14 -3494,9 +4463,14 @@@ msgstr "
"být nutně správné, dokud znova nespustíte program.\n"
# status
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "odvolán"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "platnost skončila"
@@@ -5404,12 -4251,10 +5404,12 @@@ msgstr " Otisk klíče =
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "zapamatovává se soubor klíčů „%s“\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5418,7 -4263,6 +5418,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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5427,7 -4271,6 +5427,7 @@@ msgstr[0] "vyprázdní keš
msgstr[1] "vyprázdní keš"
msgstr[2] "vyprázdní keš"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5436,7 -4279,6 +5436,7 @@@ msgstr[0] "1 špatný podpis\n
msgstr[1] "1 špatný podpis\n"
msgstr[2] "1 špatný podpis\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: soubor klíčů (keyring) vytvořen\n"
@@@ -5530,7 -4353,6 +5530,7 @@@ msgstr "požaduji klíč %s z %s\n
msgid "no keyserver known\n"
msgstr "žádná operace se serverem klíčů!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "přeskočen „%s“: %s\n"
@@@ -5830,119 -4591,87 +5830,109 @@@ msgstr "chyba při čtení v „%s“:
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použijte místo něj „%s%s“ \n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROVÁNÍ: používání příkaz „%s“ se nedoporučuje - nepoužívejte jej\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – účinkuje pouze v %s\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje kromě v %s\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Nezkomprimováno"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "nezkomprimováno|nic"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "tato zpráva nemusí být s %s použitelná\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "nejednoznačná volba „%s“\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "neznámá volba „%s“\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"U veřejného klíče ECDSA se očekává, že v kódování SEC bude délka násobkem 8 "
"bitů\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "neznámý slabý hashovací algoritmus „%s“\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Soubor „%s“ existuje. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Přepsat (a/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: neznámá přípona\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Vložte nový název souboru"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "zapisuji do standardního výstupu\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "v „%s“ se předpokládají podepsaná data\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "vytvořen nový konfigurační soubor „%s“\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROVÁNÍ: potencionálně nebezpečně symetricky zašifrován klíč sezení\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpacket typu %d má nastavený kritický bit\n"
@@@ -6764,22 -5344,18 +6754,22 @@@ msgstr "podepisuji:
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klíč není označen jako nedostatečně bezpečný – nemohu jej použít s falešným "
"RNG!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "přeskočen „%s“: duplikován\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "přeskočeno: tajný klíč je už v databázi\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"toto je PGP klíč vygenerovaný podle algoritmu Elgamal,\n"
@@@ -6864,7 -5424,6 +6854,7 @@@ msgstr "transakce s databází důvěr
msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -7005,10 -5536,6 +6995,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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7043,7 -5565,6 +7033,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7074,31 -5591,26 +7064,31 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "chyba při zjišťování ID odpovídače: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "vypsat seznam klíčů a id uživatelů"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "platnost: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "chyba při získání uložených příznaků: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, 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"
@@@ -7106,22 -5618,15 +7096,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypsat seznam klíčů"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7130,7 -5635,6 +7116,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7139,7 -5643,6 +7125,7 @@@ msgstr[0] "zašifrováno s heslem %lu\n
msgstr[1] "zašifrováno s heslem %lu\n"
msgstr[2] "zašifrováno s heslem %lu\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7148,7 -5651,6 +7134,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7157,7 -5659,6 +7143,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7165,7 -5666,6 +7151,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7173,7 -5673,6 +7159,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7181,7 -5680,6 +7167,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7189,7 -5687,6 +7175,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7197,7 -5694,6 +7183,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7205,12 -5701,10 +7191,12 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7219,48 -5713,39 +7205,48 @@@ msgstr "vypsat hash zprávy
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "chyba při zápisu klíče: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7268,7 -5753,6 +7254,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7276,7 -5760,6 +7262,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7284,7 -5767,6 +7270,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7292,7 -5774,6 +7278,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7300,7 -5781,6 +7286,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7308,7 -5788,6 +7294,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7316,18 -5795,15 +7302,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Smazáno %d podpisů.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7336,13 -5812,11 +7322,13 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zašifrováno s heslem %lu\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7351,31 -5825,25 +7337,31 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "platnost: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7393,19 -5861,15 +7379,19 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9551,8 -7570,6 +9537,8 @@@ msgstr "namísto „https“ se použij
msgid "CRL access not possible due to disabled %s\n"
msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/da.po
index 9b745e8,be65462..c9f55bd
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -127,8 -109,6 +127,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Adgangsfrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "matcher ikke - prøv igen"
@@@ -168,65 -140,42 +168,65 @@@ msgstr "Ugyldig PIN
msgid "Bad Passphrase"
msgstr "Ugyldig adgangsfrase"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -235,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Tillad"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Nægt"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Genindtast venligst denne adgangsfrase"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -261,7 -205,6 +261,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
@@@ -441,10 -353,6 +441,10 @@@ msgstr "kør i servertilstand (forgrund
msgid "run in supervised mode"
msgstr "kør i servertilstand"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "uddybende"
@@@ -550,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
@@@ -576,37 -452,26 +576,37 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, 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:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "tilvalgsfil »%s«: %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -655,15 -511,11 +655,15 @@@ msgstr "listen() mislykkedes: %s\n
msgid "listening on socket '%s'\n"
msgstr "lytter på sokkel »%s«\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "kan ikke oprette mappe »%s«: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -706,19 -551,15 +706,19 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kører i denne session\n"
@@@ -734,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -743,9 -580,6 +743,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -870,8 -685,6 +870,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -925,7 -731,6 +925,7 @@@ msgstr "Ændr adgangsfrasen
msgid "I'll change it later"
msgstr "Jeg ændrer den senere"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -933,13 -738,11 +933,13 @@@
"%%0A?"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktiver nøgle"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1777,8 -1393,6 +1777,8 @@@ msgstr "Fejl: Adresse er for lang (begr
msgid "error reading '%s': %s\n"
msgstr "fejl ved læsning af »%s«: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -2076,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
@@@ -2327,8 -1824,6 +2327,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2352,8 -1843,6 +2352,8 @@@ msgstr "nøgle %s: nøgle i PGP 2.x-sti
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2363,8 -1851,6 +2363,8 @@@ msgstr "fejl ved oprettelse af »%s«:
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2403,247 -1883,191 +2403,247 @@@ msgstr "fejl ved indhentelse af »%s«
msgid "No fingerprint"
msgstr "Ingen fingeraftryk"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "opret en underskrift"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "vis nøgler"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "vis nøgler og underskrifter"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "fjern nøgler fra den hemmelige nøglering"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "eksporter nøgler"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "eksporter nøgler til en nøgletjener"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importer nøgler fra en nøgleserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "søg efter nøgler på en nøgleserver"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "opdater alle nøgler fra en nøgleserver"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importer/sammenføj nøgler"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "udskriv kortstatus"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "ændr data på et kort"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "ændr et korts PIN"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "opdater troværdighedsdatabasen"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "kør i servertilstand"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "lav ingen ændringer"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "spørg før overskrivning"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2651,7 -2075,6 +2651,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2681,14 -2104,12 +2681,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
# Skal alt dette oversættes eller er det tilvalgene?
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2703,7 -2124,6 +2703,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2711,81 -2131,66 +2711,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2794,19 -2199,16 +2794,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2816,461 -2218,363 +2816,461 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -3849,8 -3042,6 +3849,8 @@@ msgstr "[tilbagekald]
msgid "[self-signature]"
msgstr "[egenunderskrift]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@@ -4651,14 -3682,9 +4651,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "tilbagekaldt"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "udløbet"
@@@ -5625,13 -4472,11 +5625,13 @@@ msgstr " Nøglefingeraftryk =
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellemlagrer nøglering »%s«\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5639,14 -4484,12 +5639,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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5654,7 -4497,6 +5654,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ugyldig underskrift\n"
msgstr[1] "1 ugyldig underskrift\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nøglering oprettet\n"
@@@ -5747,7 -4570,6 +5747,7 @@@ msgstr "anmoder om nøgle %s fra %s\n
msgid "no keyserver known\n"
msgstr "ingen nøgleserverhandling!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "udelod »%s«: %s\n"
@@@ -6050,129 -4811,94 +6050,116 @@@ msgstr "læsefejl i »%s«: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: forældet indstilling »%s«\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "brug venligst »%s%s« i stedet for\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ADVARSEL: »%s« er en forældet kommando - brug den ikke\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Ukomprimeret"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "ukomprimeret|ingen"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "denne besked kan nok ikke bruges af %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydigt tilvalg »%s«\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Filen »%s« findes. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Overskriv? (j/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ukendt suffiks\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Indtast nyt filnavn"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "skriver til stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "antager underskrevne data i »%s«\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "ny konfigurationsfil »%s« oprettet\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "ADVARSEL: indstillinger i »%s« er endnu ikke aktive under denne kørsel\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan ikke håndtere offentlig nøglealgoritme %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ADVARSEL: potentiel usikker symmetrisk krypteret sessionsnøgle\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke af typen %d har kritiske bitsæt\n"
@@@ -7006,21 -5583,17 +6993,21 @@@ msgstr "underskriver:
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nøgle er ikke markeret som usikker - kan ikke bruge den med falsk RNG!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "udelod »%s«: duplikeret\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
@@@ -7109,7 -5666,6 +7096,7 @@@ msgstr "transaktion for trustdb er for
msgid "%s: directory does not exist!\n"
msgstr "%s: mappe findes ikke!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7253,10 -5781,6 +7240,10 @@@ msgstr "fejl ved oprettelse af midlerti
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7291,7 -5810,6 +7278,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7321,53 -5835,41 +7308,49 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "vis nøgle og bruger-id'er"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validitet: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vis nøgler"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7375,7 -5877,6 +7358,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7383,7 -5884,6 +7366,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "krypteret med %lu adgangsfraser\n"
msgstr[1] "krypteret med %lu adgangsfraser\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7391,7 -5891,6 +7374,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7399,54 -5898,46 +7382,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7455,108 -5946,90 +7438,108 @@@ msgstr "vis beskedsammendrag
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "fejl ved skrivning af nøgle: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Slettede %d underskrifter.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7564,13 -6037,11 +7547,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krypteret med %lu adgangsfraser\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7578,31 -6049,25 +7561,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "validitet: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7619,19 -6084,15 +7602,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9892,8 -7908,6 +9875,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/de.po
index b661b85,8a4c0f9..58f7310
--- 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-04-03 21:03+0200\n"
- "PO-Revision-Date: 2017-04-03 17:10+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\n"
+ "PO-Revision-Date: 2017-05-15 16:00+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -112,8 -94,6 +112,8 @@@ msgstr "PIN:
msgid "Passphrase:"
msgstr "Passphrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
@@@ -153,61 -125,38 +153,61 @@@ msgstr "Falsche PIN!
msgid "Bad Passphrase"
msgstr "Falsche Passphrase!"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
- #: agent/command-ssh.c:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "Fehler beim Holen der Liste der Karten: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -216,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Erlauben"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Verweigern"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -245,7 -189,6 +245,7 @@@ msgstr "
"Schlüssel%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
"schützen."
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@@ -408,10 -320,6 +408,10 @@@ msgstr "Im Server Modus ausführen
msgid "run in supervised mode"
msgstr "Im \"Supervised\" Modus ausführen"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "Detaillierte Informationen"
@@@ -509,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
@@@ -531,33 -407,22 +531,33 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
@@@ -601,14 -457,10 +601,14 @@@ msgstr "Der listen()-Aufruf ist fehlges
msgid "listening on socket '%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
@@@ -648,18 -493,14 +648,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
@@@ -675,8 -514,6 +675,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -684,9 -521,6 +684,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -807,8 -622,6 +807,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Nein"
@@@ -864,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:1492
++#: agent/findkey.c:1490
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -873,11 -678,9 +873,11 @@@ msgstr "
"Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A %s%%0A %%C%%0Awirklich "
"entfernen?"
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Schlüssel löschen"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1680,8 -1296,6 +1680,8 @@@ msgstr "Fehler: URL ist zu lang (Grenz
msgid "error reading '%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
@@@ -1967,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@@ -2211,8 -1708,6 +2211,8 @@@ msgstr "Das GnuPG Datensicherungsforma
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
@@@ -2235,8 -1726,6 +2235,8 @@@ msgstr "Schlüssel %s: PGP 2.x-artiger
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2245,8 -1733,6 +2245,8 @@@
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(Prüfe das Argument der Option '%s')\n"
@@@ -2281,236 -1761,180 +2281,236 @@@ msgstr "Fehler beim automatischen hole
msgid "No fingerprint"
msgstr "Kein Fingerabdruck vorhanden"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr ""
"WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
"%s\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "Daten verschlüsseln"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "Liste der Schlüssel"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "Liste der Schlüssel und ihrer Signaturen"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "Schnell ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "Schnell eine neue User-ID anfügen"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
msgstr "Schnell eine User-ID widerrufen"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly set a new expiration date"
msgstr "Schnell ein neues Ablaufdatum setzen"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "Schlüssel schnell signieren"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "Schlüssel schnell nur für diesen Rechner signieren"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "Schlüssel signieren"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "Schlüssel exportieren"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "Schlüssel zu einem Schlü.server exportieren"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "Schlüssel von einem Schlü.server importieren"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "Schlüssel auf einem Schlü.server suchen"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2519,7 -1943,6 +2519,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
msgid ""
"@\n"
"Examples:\n"
@@@ -2539,11 -1962,9 +2539,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2553,7 -1974,6 +2553,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2561,74 -1981,59 +2561,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
"Verzeichnis `%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2636,20 -2041,17 +2636,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
"Verzeichnisses `%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2657,452 -2059,354 +2657,452 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
"Erweiterung `%s'\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, c-format
msgid "valid values for option '%s':\n"
msgstr "Gültige Argumente für Option '%s':\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Unbekannte TOFU Regel '%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, c-format
msgid "invalid filter option: %s\n"
msgstr "Ungültige Filter-Option: %s\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
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:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
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:3248
++#: g10/gpg.c:3251
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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
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:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, 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:4928
++#: g10/gpg.c:4931
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:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3670,8 -2863,6 +3670,8 @@@ msgstr "[Widerruf]
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "Fehler beim Allozieren von Speicher: %s\n"
@@@ -4440,14 -3471,9 +4440,14 @@@ msgstr "
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "widerrufen"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "verfallen"
@@@ -5379,33 -4226,28 +5379,33 @@@ msgstr " Schl.-Fingerabdruck =
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "Puffern des Schlüsselbundes `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, 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:1554
++#: g10/keyring.c:1559
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu Beglaubigung)\n"
msgstr[1] " (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
@@@ -5496,7 -4319,6 +5496,7 @@@ msgstr "fordere Schlüssel %s von %s an
msgid "no keyserver known\n"
msgstr "Kein Schlüsselserver bekannt\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "übersprungen \"%s\": %s\n"
@@@ -5795,34 -4556,28 +5795,34 @@@ msgstr "(gemeldeter Fehler: %s <%s>)\n
msgid "(further info: "
msgstr "(weitere Infos: "
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: mißbilligte Option \"%s\".\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: Die Option \"%s\" is veraltet - sie hat eine Wirkung nur in %s.\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5830,91 -4585,64 +5830,80 @@@ msgstr "
"WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
"in %s.\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "nicht komprimiert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "unkomprimiert|kein|keine"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "Mehrdeutige Option '%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "Unbekannte Option '%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
"haben\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Datei '%s' existiert bereits. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Überschreiben (j/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: unbekannte Dateinamenerweiterung\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Neuen Dateinamen eingeben"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "Schreiben auf die Standardausgabe\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
"Sitzungsschlüssel\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@@ -6751,22 -5330,18 +6740,22 @@@ msgstr "signiere:
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
"echten Zufallsgenerator verwendbar\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "übersprungen \"%s\": doppelt\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
@@@ -6851,7 -5410,6 +6840,7 @@@ msgstr "trustdb Transaktion zu groß\n
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6991,10 -5521,6 +6980,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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
@@@ -7025,7 -5546,6 +7014,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
@@@ -7065,48 -5581,36 +7054,44 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, c-format
msgid "policy: %s"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
msgid "this key"
msgstr "dieser Schlüssel"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "Verified %ld messages signed by \"%s\"."
msgid "Verified %d message."
@@@ -7114,7 -5618,6 +7099,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "%ld überprüfte Nachrichten von \"%s\"."
msgstr[1] "%ld überprüfte Nachrichten von \"%s\"."
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7122,7 -5625,6 +7107,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "Verschlüsselt mit %lu Passphrases\n"
msgstr[1] "Verschlüsselt mit %lu Passphrases\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7131,7 -5633,6 +7116,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "%ld Nachricht in der Zukunft signiert."
msgstr[1] "%ld Nachrichten in der Zukunf signiert."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7140,7 -5641,6 +7125,7 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "%ld Nachricht in der Zukunft signiert."
msgstr[1] "%ld Nachrichten in der Zukunf signiert."
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7149,7 -5649,6 +7134,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7158,7 -5657,6 +7143,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7167,7 -5665,6 +7152,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Monats."
msgstr[1] " innerhalb der letzten %ld Monate."
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7176,7 -5673,6 +7161,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Monats."
msgstr[1] " innerhalb der letzten %ld Monate."
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7185,7 -5681,6 +7170,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7194,14 -5689,12 +7179,14 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
msgid "Messages verified in the past: %d."
msgstr " innerhalb des letzten Tages."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7217,7 -5710,6 +7202,7 @@@ msgstr "
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
"Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7231,101 -5723,74 +7216,89 @@@
#. 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
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr "gGaAuUlLfF"
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
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
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
- #: g10/tofu.c:2874
- #, fuzzy, c-format
- #| msgid "%d~year"
- #| msgid_plural "%d~years"
++#: g10/tofu.c:2878
+ #, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
- msgstr[0] "%d~Jahr"
- msgstr[1] "%d~Jahre"
+ msgstr[0] "%lld~Jahr"
+ msgstr[1] "%lld~Jahre"
- #: g10/tofu.c:2879
- #, fuzzy, c-format
- #| msgid "%d~month"
- #| msgid_plural "%d~months"
++#: g10/tofu.c:2883
+ #, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
- msgstr[0] "%d~Monat"
- msgstr[1] "%d~Monate"
+ msgstr[0] "%lld~Monat"
+ msgstr[1] "%lld~Monate"
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%lld~Woche"
+ msgstr[1] "%lld Wochen"
- #: g10/tofu.c:2889
- #, fuzzy, c-format
- #| msgid "%d~day"
- #| msgid_plural "%d~days"
++#: g10/tofu.c:2893
+ #, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
- msgstr[0] "%d~Tag"
- msgstr[1] "%d~Tage"
+ msgstr[0] "%lld~Tag"
+ msgstr[1] "%lld~Tage"
- #: g10/tofu.c:2894
- #, fuzzy, c-format
- #| msgid "%d~hour"
- #| msgid_plural "%d~hours"
++#: g10/tofu.c:2898
+ #, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
- msgstr[0] "%d~Stunde"
- msgstr[1] "%d~Stunden"
+ msgstr[0] "%lld~Stunde"
+ msgstr[1] "%lld~Stunden"
- #: g10/tofu.c:2899
- #, fuzzy, c-format
- #| msgid "%d~minute"
- #| msgid_plural "%d~minutes"
++#: g10/tofu.c:2903
+ #, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
- msgstr[0] "%d~Minute"
- msgstr[1] "%d~Minuten"
+ msgstr[0] "%lld~Minute"
+ msgstr[1] "%lld~Minuten"
- #: g10/tofu.c:2901
- #, fuzzy, c-format
- #| msgid "%d~second"
- #| msgid_plural "%d~seconds"
++#: g10/tofu.c:2905
+ #, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
- msgstr[0] "%d~Sekunde"
- msgstr[1] "%d~Sekunden"
+ msgstr[0] "%lld~Sekunde"
+ msgstr[1] "%lld~Sekunden"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, fuzzy, c-format
#| msgid "TOFU: few signatures %d message %s"
#| msgid_plural "TOFU: few signatures %d messages %s"
@@@ -7338,13 -5803,11 +7311,13 @@@ msgstr "
"suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
"zu markieren."
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d Beglaubigungen entfernt.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7361,13 -5824,11 +7334,13 @@@ msgstr[1] "
"%ld überprüfte Nachrichten von \"%s\"\n"
"in den letzten %s."
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "Verschlüsselt mit %lu Passphrases\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7384,13 -5845,11 +7357,13 @@@ msgstr[1] "
"%ld überprüfte Nachrichten von \"%s\"\n"
"in den letzten %s."
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "policy: %s"
msgid "(policy: %s)"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
#, fuzzy
#| msgid "Warning: we've have yet to see a message signed by this key!\n"
msgid ""
@@@ -7399,7 -5858,6 +7372,7 @@@ msgstr "
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
#, fuzzy
#| msgid "Warning: we've only seen a single message signed by this key!\n"
msgid ""
@@@ -7408,7 -5866,6 +7381,7 @@@ msgstr "
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
#, 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"
@@@ -7416,7 -5873,6 +7389,7 @@@ msgstr "
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
#, 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"
@@@ -7424,7 -5880,6 +7397,7 @@@ msgstr "
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, fuzzy, c-format
#| msgid ""
#| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7465,18 -5920,14 +7438,18 @@@ msgstr[1] "
" %s\n"
"um den Schlüssel als Fälschung zu markieren.\n"
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9650,8 -7656,6 +9623,8 @@@ msgstr "Es wird \"HTTP\" anstatt \"HTTP
msgid "CRL access not possible due to disabled %s\n"
msgstr "CRL Zugriff nicht möglich da %s abgeschaltet ist\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/el.po
index faf46a4,96adc8e..0156e88
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -106,8 -88,6 +106,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "κακή φράση κλειδί"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -152,95 -124,66 +152,95 @@@ msgstr "κακό MPI
msgid "Bad Passphrase"
msgstr "κακή φράση κλειδί"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
- #: agent/command-ssh.c:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
@@@ -406,10 -318,6 +406,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Το κλειδί έχει παρακαμθεί"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "αναλυτικά"
@@@ -518,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Αναφέρετε τα προβλήματα στο <gnupg-bugs at gnu.org>\n"
@@@ -538,36 -414,25 +538,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "αρχείο επιλογών `%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "ανάγνωση επιλογών από `%s'\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -614,15 -470,11 +614,15 @@@ msgstr "η ενημέρωση απέτ�
msgid "listening on socket '%s'\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: κατάλογος δημιουργήθηκε\n"
@@@ -662,18 -507,14 +662,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: παραλείφθηκε: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@@ -689,8 -528,6 +689,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -535,6 +698,9 @@@ msgstr "
"@Εντολές:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -814,8 -629,6 +814,8 @@@ msgstr "
msgid "Yes"
msgstr "ναι|ναί"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -866,19 -672,16 +866,19 @@@ msgstr "αλλαγή της φράση�
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "ενεργοποιεί ένα κλειδί"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1740,8 -1356,6 +1740,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
@@@ -2037,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@@ -2296,8 -1793,6 +2296,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: παραλείφθηκε: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2323,8 -1814,6 +2323,8 @@@ msgstr "κλειδί %08lX: κλειδ
msgid "WARNING: nothing exported\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2335,8 -1823,6 +2335,8 @@@ msgstr "σφάλμα κατά τη δη
msgid "[User ID not found]"
msgstr "[User id δεν βρέθηκε]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
@@@ -2372,257 -1852,201 +2372,257 @@@ msgstr "σφάλμα κατά τη δη
msgid "No fingerprint"
msgstr "απεικόνιση του fingerprint"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Μη έγκυρο κλειδί %08lX έγινε έγκυρο από το --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[αρχείο]|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "κρυπτογράφηση δεδομένων"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "επαλήθευση μιας υπογραφής"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "απεικόνιση της λίστας κλειδιών"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "έλεγχος υπογραφής κλειδιού"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "υπογραφή ενός κλειδιού"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "υπογραφή ενός κλειδιού τοπικά"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "υπογραφή ενός κλειδιού"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "υπογραφή ενός κλειδιού τοπικά"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "εξαγωγή κλειδιών"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "εισαγωγή/συγχώνευση κλειδιών"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "δημιουργία ascii θωρακισμένης εξόδου"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "χρήση κανονικής κατάστασης κειμένου"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "να μη γίνει καμμία αλλαγή"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "ερώτηση πριν την επικάλυψη"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2630,7 -2054,6 +2630,7 @@@ msgstr "
"@\n"
"(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2660,13 -2083,11 +2660,13 @@@ msgstr "
" --list-keys [ονόματα] απεικόνιση κλειδιών\n"
" --fingerprint [ονόματα] απεικόνιση αποτυπωμάτων (fingerprints)\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2681,7 -2102,6 +2681,7 @@@ msgstr "
"υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
"η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2689,554 -2109,438 +2689,554 @@@ msgstr "
"\n"
"Υποστηριζόμενοι αλγόριθμοι:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "ΔημοσΚλειδί:"
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Κρυπταλγόριθμος: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Συμπίεση: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "χρήση: gpg [επιλογές] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "συγκρουόμενες εντολές\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Μη έγκυρη διεύθυνση Email\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "αδυναμία ορισμού του exec-path σε %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "το %s δεν επιτρέπεται με το %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
"δεν είναι έγκυρος\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "μη έγκυρες προεπιλογές\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
"δημοσίου κλειδιού\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver αποστολή απέτυχε: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver λήψη απέτυχε: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver αναζήτηση απέτυχε: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver ανανέωση απέτυχε: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "αποθωράκιση απέτυχε: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
@@@ -3811,8 -3004,6 +3811,8 @@@ msgstr "[ανάκληση]
msgid "[self-signature]"
msgstr "[ιδιο-υπογραφή]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
@@@ -4632,15 -3663,10 +4632,15 @@@ msgstr "
"Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
"εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[ανακλημένο]"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5617,26 -4464,22 +5617,26 @@@ msgstr " Αποτύπωμα κλε�
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "έλεγχος κλειδοθήκης `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5644,7 -4487,6 +5644,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 κακή υπογραφή\n"
msgstr[1] "1 κακή υπογραφή\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: κλειδοθήκη δημιουργήθηκε\n"
@@@ -5738,7 -4561,6 +5738,7 @@@ msgstr "αίτηση κλειδιού %
msgid "no keyserver known\n"
msgstr "μη έγκυρες επιλογές εξαγωγής\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "παραλείφθηκε `%s': %s\n"
@@@ -6045,124 -4806,89 +6045,111 @@@ msgstr "σφάλμα ανάγνωσης
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "παρακαλώ χρησιμοποιήστε το \"%s%s\" καλύτερα\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Ασυμπίεστο"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Ασυμπίεστο"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "αυτό το μήνυμα ίσως δεν μπορεί να χρησιμοποιηθεί από %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "ανάγνωση επιλογών από `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "άγνωστη κλάση υπογραφής"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Το αρχείο `%s' υπάρχει ήδη. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Επικάλυψη (y/N); "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: άγνωστη κατάληξη\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Πληκτρολογήστε ένα νέο όνομα αρχείου"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "εγγραφή στην stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "υπόθεση υπογεγραμμένων δεδομένων στο `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: οι επιλογες στο `%s' δεν είναι ενεργές σε αυτή την εκτέλεση\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: πιθανόν μη ασφαλές κρυπτογραφημένο συμμετρικά κλειδί\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "υποπακέτο τύπου %d έχει ορισμένο το κριτικό bit\n"
@@@ -6983,22 -5560,18 +6970,22 @@@ msgstr "υπογραφή:
msgid "%s encryption will be used\n"
msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"το κλειδί δεν έχει σημειωθεί σαν ανασφαλές - δεν μπορεί να χρησιμοποιηθεί με "
"ψεύτικη RNG!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "παραλείφθηκε `%s': αντιγράφτηκε\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7087,7 -5644,6 +7074,7 @@@ msgstr "πολύ μεγάλη συνα�
msgid "%s: directory does not exist!\n"
msgstr "%s: ο φάκελος δεν υπάρχει!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "αδυναμία κλεισίματος του `%s': %s\n"
@@@ -7230,10 -5758,6 +7217,10 @@@ msgstr "σφάλμα στη δημιο�
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7265,7 -5784,6 +7252,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7294,58 -5808,45 +7281,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "απεικόνιση των κλειδιών και των user ID"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Πολιτική: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "απεικόνιση της λίστας κλειδιών"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7353,68 -5854,58 +7336,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
msgstr[1] "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
@@@ -7422,149 -5913,123 +7405,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Διαγράφηκαν %d υπογραφές.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Πολιτική: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7581,18 -6046,14 +7564,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9775,8 -7791,6 +9758,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/en at boldquot.po
index d5a9ebf,0000000..86e0679
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10717 -1,0 +1,10703 @@@
+# 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.20\n"
++"Project-Id-Version: GNU gnupg 2.1.21\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
- "PO-Revision-Date: 2017-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\n"
++"PO-Revision-Date: 2017-05-15 16:15+0200\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: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:499
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:500
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:501
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:502
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:503
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:504
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: 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:507
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: 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: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:861
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: 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: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:1029 agent/call-pinentry.c:1208
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
+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:1076
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:1087
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1117
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1125
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1130
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1143
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1143
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
+#, 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:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
- #: agent/command-ssh.c:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
+#, c-format
+msgid "error getting list of cards: %s\n"
+msgstr "error getting list of cards: %s\n"
+
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
+#, 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:2788
++#: agent/command-ssh.c:2781
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
+#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
+#, 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:3641
++#: agent/command-ssh.c:3635
+#, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "failed to create stream from socket: %s\n"
+
+#: agent/divert-scd.c:115
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:116
+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:244
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:249
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:256
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: 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:354
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:356
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:357
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: 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:364
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:365
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: 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: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:150 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:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
+#: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
+#: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
+msgid "verbose"
+msgstr "verbose"
+
+#: agent/gpg-agent.c:158 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
+#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
+#: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
+#: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
+#: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
+#: agent/gpg-agent.c:171
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: agent/gpg-agent.c:172 tools/symcryptrun.c:180
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
+#: agent/gpg-agent.c:174
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: agent/gpg-agent.c:179
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:181
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:185
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:201
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: agent/gpg-agent.c:203
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
+#: agent/gpg-agent.c:206
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: agent/gpg-agent.c:220
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
+#: agent/gpg-agent.c:222
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: agent/gpg-agent.c:224
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
+#: agent/gpg-agent.c:227
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:229
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
+#: agent/gpg-agent.c:232
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
+#: agent/gpg-agent.c:234
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:237
+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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
+#: agent/gpg-agent.c:494
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
+#: agent/gpg-agent.c:496
+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:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘[1m%s[0m’ given\n"
+
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘[1m%s[0m’ is not considered an option\n"
+
+#: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
+#: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘[1m%s[0m’ is too long\n"
+
+#: agent/gpg-agent.c:2156
+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:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
+#: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
+#: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
+#: dirmngr/dirmngr.c:1215
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
+#: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
+#: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘[1m%s[0m’\n"
+
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 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:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
+#: agent/gpg-agent.c:2266
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
+#: agent/gpg-agent.c:2270
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘[1m%s[0m’ as home directory\n"
+
+#: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2620
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2625
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
+#: agent/gpg-agent.c:2700
+#, 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:2705
+#, 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: 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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
+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:462
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:722 tools/symcryptrun.c:458
+#, 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:1559
+#: 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 “[1m%s[0m” ignored in '%s', line %d\n"
+
+#: agent/trustlist.c:206
+#, c-format
+msgid "system trustlist '%s' not available\n"
+msgstr "system trustlist ‘[1m%s[0m’ 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 “[1m%s[0m”%%0Ato correctly certify user "
+"certificates?"
+
+#: agent/trustlist.c:673 common/audit.c:467
+msgid "Yes"
+msgstr "Yes"
+
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: 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 “[1m%s[0m”%%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:283
+#, 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:299
+#, 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:313 agent/findkey.c:320
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:321
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
+#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
+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: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: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: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:1244
+#, 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: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: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: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 “[1m%s[0m”\n"
+
+#: common/sysutils.c:282
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “[1m%s[0m”\n"
+
+#: common/sysutils.c:693
+#, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "waiting for file ‘[1m%s[0m’ to become accessible ...\n"
+
+#: common/sysutils.c:719
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "renaming ‘[1m%s[0m’ to ‘[1m%s[0m’ 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:865 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 “[1m%s[0m” - 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: “[1m%s%s[0m” is an obsolete option - it has no effect\n"
+
+#: common/miscellaneous.c:607
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘[1m%s[0m’ ignored\n"
+
+#: common/asshelp.c:380
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘[1m%s[0m’\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 ‘[1m%s[0m’\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:3256
+#, 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 “[1m%.50s[0m”\n"
+
+#: common/argparse.c:391
+#, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "invalid argument for option “[1m%.50s[0m”\n"
+
+#: common/argparse.c:393
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "option “[1m%.50s[0m” does not expect an argument\n"
+
+#: common/argparse.c:395
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "invalid command “[1m%.50s[0m”\n"
+
+#: common/argparse.c:397
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "option “[1m%.50s[0m” is ambiguous\n"
+
+#: common/argparse.c:399
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "command “[1m%.50s[0m” is ambiguous\n"
+
+#: common/argparse.c:401 dirmngr/dirmngr.c:1262
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: common/argparse.c:403
+#, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "invalid option “[1m%.50s[0m”\n"
+
+#: common/utf8conv.c:123
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘[1m%s[0m’ to ‘[1m%s[0m’ 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 ‘[1m%s[0m’ to ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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:805
+#: dirmngr/dirmngr.c:814
+#, 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:423
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:462
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:473
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:486
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:499
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:552
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:687
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:700
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:872 g10/armor.c:1492
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:915
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:949
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:957
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:961 g10/armor.c:1529
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:981
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:985
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1305
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1310
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1314
+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:1210
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
+#: g10/build-packet.c:1262
+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 ‘[1m=[0m’\n"
+
+#: g10/build-packet.c:1274 g10/build-packet.c:1370
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘[1m@[0m’ character\n"
+
+#: g10/build-packet.c:1280 g10/build-packet.c:1376
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "a notation name must not contain more than one ‘[1m@[0m’ character\n"
+
+#: g10/build-packet.c:1298
+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:1354
+msgid "a notation name may not contain an '=' character\n"
+msgstr "a notation name may not contain an ‘[1m=[0m’ character\n"
+
+#: g10/build-packet.c:1360
+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:1419 g10/build-packet.c:1430
+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:170
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:197 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:203 sm/call-agent.c:104 sm/call-dirmngr.c:171
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘[1m%s[0m’ is older than us (%s < %s)"
+
+#: g10/call-agent.c:209 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:384 g10/card-util.c:1770
+#, 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:1776
+#, 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:1973 g10/delkey.c:128 g10/keyedit.c:2034
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
+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:2612
+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:1536 g10/card-util.c:1652
+#: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
+#: g10/keygen.c:1934 g10/keygen.c:2302 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:534
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:535
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:535
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:562
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:562
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:712
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:714
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
+#: g10/card-util.c:716
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:733
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:735
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:753
+#, 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:774
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:782
+#, 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:877 g10/decrypt-data.c:241 g10/import.c:348
+#: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
+#: dirmngr/dirmngr.c:1597 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:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:937
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:947
+#, 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:983
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:993
+#, 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:1076
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1084
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1093
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1115
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1129
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1151
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1174
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1224
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1225
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1325
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1342
+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:1367
+#, 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:1369
+#, 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:1370
+#, 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:1381 g10/keygen.c:2111 g10/keygen.c:2143
+#: 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:1389 g10/keygen.c:2196 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:1394
+#, 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:1414
+#, 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:1438
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1452
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1455
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1467
+#, 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 = ‘[1m%s[0m’ Admin PIN = ‘[1m%s[0m’\n"
+"You should change them using the command --change-pin\n"
+
+#: g10/card-util.c:1527
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1529 g10/card-util.c:1643
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1530 g10/card-util.c:1645
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1531 g10/card-util.c:1647
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
+#: g10/keygen.c:1799 g10/keygen.c:1827 g10/keygen.c:1941 g10/keygen.c:2049
+#: g10/keygen.c:2325 g10/revoke.c:821
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1640
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1686
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1782
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1787
+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:1790
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1795
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
+#: g10/card-util.c:1881 g10/keyedit.c:1872
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1883
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1884 g10/keyedit.c:1875
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1886
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1889
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1890
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1891
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1892
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1893
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1894
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1895
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1896
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1897
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1898
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1899
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1900
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1901
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:2025
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:2066
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2097
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2099
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2194 g10/keyedit.c:2826
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
+#: g10/decrypt.c:190 g10/encrypt.c:958
+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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “[1m%s[0m” not found: %s\n"
+
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:118 g10/getkey.c:578
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “[1m%s[0m” 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 “[1m--yes[0m”\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:202
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:204
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:204
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:227
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:240
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:276
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "there is a secret key for public key “[1m%s[0m”!\n"
+
+#: g10/delkey.c:278
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “[1m--delete-secret-keys[0m” to delete it first.\n"
+
+#: g10/encrypt.c:233 g10/sign.c:1304
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encrypt.c:240
+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:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘[1m%s[0m’ already compressed\n"
+
+#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
+#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
+#: g10/encrypt.c:606
+#, 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:708 g10/sign.c:996
+#, 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:818
+#, 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:906
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
+#: g10/encrypt.c:934 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 “[1msensitive[0m”"
+
+#: 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:1235
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘[1m%s[0m’\n"
+
+#: g10/export.c:1708
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:1903
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:1980
+#, 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:2067
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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:256
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
+#: g10/getkey.c:515
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘[1m%s[0m’ should be a long key ID or a fingerprint\n"
+
+#: g10/getkey.c:545
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
+#: g10/getkey.c:635
+#, 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:1451
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
+#: g10/getkey.c:1457
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
+#: g10/getkey.c:1459
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
+#, c-format
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "Warning: not using ‘[1m%s[0m’ as default key: %s\n"
+
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
+#, c-format
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "using “[1m%s[0m” as default secret key for signing\n"
+
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
+#, 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:3636
++#: g10/getkey.c:3637
+#, 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:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:428
++#: g10/gpg.c:431
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:433
++#: g10/gpg.c:436
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:444
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:455
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:460
++#: g10/gpg.c:463
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:463
++#: g10/gpg.c:466
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:469
++#: g10/gpg.c:472
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:474
++#: g10/gpg.c:477
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:476
++#: g10/gpg.c:479
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:478
++#: g10/gpg.c:481
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:482
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:480
++#: g10/gpg.c:483
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:481
++#: g10/gpg.c:484
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:487
++#: g10/gpg.c:490
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:488
++#: g10/gpg.c:491
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:489
++#: g10/gpg.c:492
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:492
++#: g10/gpg.c:495
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:494
++#: g10/gpg.c:497
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:500
++#: g10/gpg.c:503
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:504
++#: g10/gpg.c:507
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:506
++#: g10/gpg.c:509
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:518
++#: g10/gpg.c:521
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:527
++#: g10/gpg.c:530
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:532
++#: g10/gpg.c:535
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 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:561
++#: g10/gpg.c:564
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:568
++#: g10/gpg.c:571
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 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:601
++#: g10/gpg.c:604
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:650
++#: g10/gpg.c:653
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 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:679
++#: g10/gpg.c:682
+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:1049
++#: g10/gpg.c:1052
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
+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:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
+#, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
+msgstr ""
+"WARNING: unsafe enclosing directory ownership on configuration file ‘[1m"
+"%s[0m’\n"
+
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
+msgstr ""
+"WARNING: unsafe enclosing directory ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
+msgstr ""
+"WARNING: unsafe enclosing directory permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
+#, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
+msgstr ""
+"WARNING: unsafe enclosing directory permissions on configuration file ‘[1m"
+"%s[0m’\n"
+
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
+msgstr ""
+"WARNING: unsafe enclosing directory permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
+#, c-format
+msgid "valid values for option '%s':\n"
+msgstr "valid values for option '%s':\n"
+
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
+#, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "invalid value for option ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘[1m%s[0m’ ignored\n"
+
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘[1m%s[0m’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
+#, c-format
+msgid "\"%s\" is not a proper mail address\n"
+msgstr "“[1m%s[0m” is not a proper mail address\n"
+
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘[1m%s[0m’ is not a valid character set\n"
+
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
+#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
+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:3744
++#: g10/gpg.c:3747
+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:3746
++#: g10/gpg.c:3749
+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:3749
++#: g10/gpg.c:3752
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
+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:3760
++#: g10/gpg.c:3763
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
+#, c-format
+msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgstr "you may not use cipher algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
+#, c-format
+msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgstr "you may not use digest algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
+#, c-format
+msgid "you may not use compression algorithm '%s' while in %s mode\n"
+msgstr "you may not use compression algorithm ‘[1m%s[0m’ while in %s mode\n"
+
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
+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:4053
++#: g10/gpg.c:4056
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
+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:4085
++#: g10/gpg.c:4088
+#, 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:4142
++#: g10/gpg.c:4145
+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:4145
++#: g10/gpg.c:4148
+#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+"‘[1m%s[0m’ does not appear to be a valid key ID, fingerprint or keygrip\n"
+
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
+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:4939
++#: g10/gpg.c:4942
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: 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:82
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: 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:89
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:148
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: 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 ‘[1m%s[0m’"
+
+#: 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:584
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:601
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:671
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:674
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:676
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:679
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:682 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:686 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:688
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:690
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:692
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:694
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:696 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:698 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:700 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:702 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:704
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:706
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:1059
+#, 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:1101
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:1116
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
+#: g10/import.c:1128
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
+#: g10/import.c:1141
+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:1143
+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:1168
+#, 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:1443 g10/import.c:2233
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:1449
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:1450 g10/import.c:2207
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1482
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1500
+#, c-format
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
+msgstr "key %s: accepted non self-signed user ID “[1m%s[0m”\n"
+
+#: g10/import.c:1510 g10/import.c:1541
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1512
+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:1582 g10/import.c:2384
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1588
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:1603
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
+#: g10/import.c:1632
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
+#: g10/import.c:1656
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:1672 g10/import.c:2408
+#, 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:1680 g10/import.c:2415
+#, 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:1723
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “[1m%s[0m” 1 new user ID\n"
+
+#: g10/import.c:1726
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “[1m%s[0m” %d new user IDs\n"
+
+#: g10/import.c:1729
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
+#: g10/import.c:1732
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
+#: g10/import.c:1735
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
+#: g10/import.c:1738
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
+#: g10/import.c:1741
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
+#: g10/import.c:1744
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
+#: g10/import.c:1747
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d user ID cleaned\n"
+
+#: g10/import.c:1750
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d user IDs cleaned\n"
+
+#: g10/import.c:1773
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
+#: g10/import.c:2085 g10/import.c:2330
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:2093
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
+#: g10/import.c:2101
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
+#: g10/import.c:2206
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:2226 g10/import.c:2261
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:2250
+#, 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:2322
+#, 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:2377
+#, 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:2426
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:2459
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
+#: g10/import.c:2535
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:2552
+#, c-format
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
+msgstr "key %s: unsupported public key algorithm on user ID “[1m%s[0m”\n"
+
+#: g10/import.c:2554
+#, c-format
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
+msgstr "key %s: invalid self-signature on user ID “[1m%s[0m”\n"
+
+#: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:2572
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:2586
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:2599
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:2615
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:2637
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:2650
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:2665
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:2708
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
+#: g10/import.c:2732
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:2761
+#, 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:2772
+#, 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:2790
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:2804
+#, 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:2812
+#, 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:2954
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:3018
+#, 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:3034
+#, 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:3098
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
+#: g10/import.c:3136
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:425 g10/keydb.c:452 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:428 g10/keydb.c:455
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:464 sm/keydb.c:232
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:466
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:844
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:950
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1750
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:268
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:268
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 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:633
+#, 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:642
+#, 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:805
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/keyedit.c:918
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/keyedit.c:921
+#, 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:924 g10/keylist.c:481
+#, 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:928 g10/keylist.c:477
+#, 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:932
+#, 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:937
+#, 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 ‘[1m%s[0m’ to "
+"check all signatures.\n"
+
+#: g10/keyedit.c:997 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:1001 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:1002 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:1020
+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:1037
+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:1165
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr "Skipping user ID “[1m%s[0m”, which is not a text ID.\n"
+
+#: g10/keyedit.c:1173
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
+#: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
+#: g10/keyedit.c:2253
+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:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
+#: g10/keyedit.c:2258 g10/keyedit.c:3261
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:1201
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
+#: g10/keyedit.c:1229
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
+#: g10/keyedit.c:1258
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
+#: g10/keyedit.c:1260
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:1287
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"The self-signature on “[1m%s[0m”\n"
+"is a PGP 2.x-style signature.\n"
+
+#: g10/keyedit.c:1296
+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:1309
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Your current signature on “[1m%s[0m”\n"
+"has expired.\n"
+
+#: g10/keyedit.c:1314
+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:1335
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Your current signature on “[1m%s[0m”\n"
+"is a local signature.\n"
+
+#: g10/keyedit.c:1340
+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:1360
+#, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "“[1m%s[0m” was already locally signed by key %s\n"
+
+#: g10/keyedit.c:1364
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“[1m%s[0m” was already signed by key %s\n"
+
+#: g10/keyedit.c:1369
+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:1391
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:1415
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:1433
+#, 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:1439
+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:1480
+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 "
+"“[1m0[0m”.\n"
+
+#: g10/keyedit.c:1485
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:1487
+#, 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:1489
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:1492
+#, 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:1499
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
+#: g10/keyedit.c:1526
+#, 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 “[1m%s[0m” (%s)\n"
+
+#: g10/keyedit.c:1534
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:1539
+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:1546
+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:1556
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:1563
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:1570
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1575
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1580
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1592
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
+#: g10/keyedit.c:6673 g10/sign.c:325
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1730
+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:1760
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1874
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1877
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1878
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1879
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1881
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1882
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1883
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1889
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1894
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1895
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1897
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1899
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1901
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1902
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1905
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1908
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1910
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1912
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1914
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1916
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1918
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1920
+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:1922
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1925
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1926
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1928
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1931
+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:1933
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1935
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1938
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1941
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1943
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1946
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1948
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1949
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1951
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1953
+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:1955
+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:2067
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:2167
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:2188
+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 ‘[1msign[0m’ command may be prefixed with an ‘[1ml[0m’ for local "
+"signatures (lsign),\n"
+" a ‘[1mt[0m’ for trust signatures (tsign), an ‘[1mnr[0m’ for non-revocable "
+"signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+
+#: g10/keyedit.c:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:2269
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:2273
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:2281
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:2292
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
+#: g10/keyedit.c:2316
+#, 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:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
+#: g10/keyedit.c:2343
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:2346
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2347
+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:2404
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:2416 g10/keyedit.c:5050
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:2444
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:2465
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:2484
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:2519
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:2525
+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:2527
+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:2565
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2566
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2584
+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:2595
+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:2597
+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:2655
+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:2700
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2707
+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:2709
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2783
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2787
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2798 g10/keyedit.c:2808 g10/keyedit.c:2985 g10/keyedit.c:3059
+#: g10/keyedit.c:3127 g10/keyedit.c:3351 g10/keyedit.c:3416 g10/keyedit.c:3492
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:3046
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:3072
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
+#: g10/keyedit.c:3136
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
+#: g10/keyedit.c:3167
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
+#: g10/keyedit.c:3196
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:3332 g10/keyedit.c:3335
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:3338
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:3338
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:3471
+#, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "‘[1m%s[0m’ is not a valid expiration time\n"
+
+#: g10/keyedit.c:3591
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3648
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3659
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3674 g10/keylist.c:374
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3682 g10/keyedit.c:3683
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3928
+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:4000
+#, 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:4024
+#, 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:4030
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:4075 g10/keylist.c:1888
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:4077 g10/keylist.c:1894
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:4081
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:4148
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:4152
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:4159
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:4177
+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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:4352
+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:4404
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:4405
+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:4464
+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:4469 g10/keyedit.c:4759
+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:4475
+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:4490 g10/keygen.c:2708
+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:4592
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4602
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4606
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4613
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4629
+#, 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:4633
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4668 g10/trust.c:731
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4670
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
+#: g10/keyedit.c:4676
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "User ID “[1m%s[0m”: %d signature removed\n"
+msgstr[1] "User ID “[1m%s[0m”: %d signatures removed\n"
+
+#: g10/keyedit.c:4684
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
+#: g10/keyedit.c:4685
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
+#: g10/keyedit.c:4754
+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:4765
+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:4782
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4807
+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:4822
+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:4844
+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:4862
+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:4868
+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:4932
+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:4937
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4940
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4994
+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:5173
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:5179
+#, 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:5296
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
+#, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
+msgstr "skipping v3 self-signature on user ID “[1m%s[0m”\n"
+
+#: g10/keyedit.c:5508
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5587
+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:5588
+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:5648
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5795
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5865
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5927
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:6028
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:6050
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:6191
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
+#: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
+#, 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:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:6200
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:6205
+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:6210
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:6264
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:6270
+#, 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:6299
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:6306
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:6331
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:6354
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:6387
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:6435
+#, 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:6445
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
+#: g10/keyedit.c:6462
+#, 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:6558
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:6596
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6658
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6755
+#, 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:317
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:324
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:326
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:328
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:471
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
+#: g10/keygen.c:950
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:996
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1053
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1418 g10/keygen.c:1423 g10/keygen.c:1475 g10/keygen.c:1480
+#: g10/keygen.c:1627 g10/keygen.c:1632
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1429 g10/keygen.c:1486 g10/keygen.c:1494 g10/keygen.c:1638
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1520
+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:1694
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1697
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1700
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1703
+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:1722
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1749
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1755
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1760
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1763
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1766
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1769
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1882 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:1886
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1893
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1901
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1911
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1917
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1919
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1921
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1923
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1927
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2023 sm/certreqgen-ui.c:202
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2036 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:2038 sm/certreqgen-ui.c:212
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2122 g10/keygen.c:2136
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2177
+#, 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:2185
+#, 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:2188 sm/certreqgen-ui.c:179
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2202 sm/certreqgen-ui.c:189
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2248
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2420
+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:2431
+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:2454
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2459
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2472 g10/keygen.c:2497
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2479
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2480
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2485
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2486
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2490
+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:2503
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2571
+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:2586
+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"
+" “[1mHeinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>[0m”\n"
+"\n"
+
+#: g10/keygen.c:2605
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2614
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2615
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr "The characters ‘[1m%s[0m’ and ‘[1m%s[0m’ may not appear in name\n"
+
+#: g10/keygen.c:2619
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2622
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2632
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2638
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2647
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2653
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2689
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘[1m%s[0m’ character set.\n"
+
+#: g10/keygen.c:2695
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"You selected this USER-ID:\n"
+" “[1m%s[0m”\n"
+"\n"
+
+#: g10/keygen.c:2700
+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:2725
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2735
+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:2736
+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:2741
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2742
+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:2761
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2807
+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:3903 g10/keygen.c:3970 g10/keygen.c:3987 g10/keygen.c:4010
+#: g10/keygen.c:4349 g10/keygen.c:4833 g10/keygen.c:5094 g10/keygen.c:5199
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3912
+#, c-format
+msgid ""
+"About to create a key for:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"About to create a key for:\n"
+" “[1m%s[0m”\n"
+"\n"
+
+#: g10/keygen.c:3914
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
+#: g10/keygen.c:3935
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
+#: g10/keygen.c:3940
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
+#: g10/keygen.c:3946
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
+#: g10/keygen.c:4334
+#, c-format
+msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
+msgstr "Note: Use “[1m%s %s[0m” for a full featured key generation dialog.\n"
+
+#: g10/keygen.c:4377
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:4437
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
+#: g10/keygen.c:4457
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:4611 g10/keygen.c:4767
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:4761
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:4775
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
+#: g10/keygen.c:4808
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:4820
+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 “[1m--edit-key[0m” to generate a subkey for this purpose.\n"
+
+#: g10/keygen.c:4966 g10/keygen.c:5150
+#, 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:4968 g10/keygen.c:5152
+#, 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:4979 g10/keygen.c:5163
+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:4991 g10/keygen.c:4993
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keygen.c:5000 g10/keygen.c:5002
+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:5021 g10/keygen.c:5177
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
+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:473
+#, 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:486
+#, 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:568
+#, 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:590
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1755
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1757
+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:1765
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1767 g10/keylist.c:1777
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1772 g10/keylist.c:1788
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1839
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\n"
+
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
+#, 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:1552
++#: g10/keyring.c:1557
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
+#, 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 "“[1m%s[0m” not a key ID: skipping\n"
+
+#: g10/keyserver.c:1423 g10/keyserver.c:1456
+#, 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:1430
+#, 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:1534
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
+#: g10/keyserver.c:1537
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1541
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1706
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1710
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1811 g10/keyserver.c:1967
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
+#: g10/keyserver.c:1829
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1870
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
+#: g10/keyserver.c:1886
+#, 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 " “[1m%s[0m”\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 “[1mfor-your-eyes-only[0m”\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 “[1mgpg --import[0m” to apply\n"
+
+#: g10/mainproc.c:1223 g10/mainproc.c:1266
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1600
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1602
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1604
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1623
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: g10/mainproc.c:1732
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
+#: g10/mainproc.c:1746 g10/mainproc.c:1754
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: g10/mainproc.c:1747 g10/mainproc.c:1755
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
+#: g10/mainproc.c:1759
+#, 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:1765
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “[1m%s[0m”\n"
+
+#: g10/mainproc.c:1782
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:2017
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:2055
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
+#: g10/mainproc.c:2138
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
+#: g10/mainproc.c:2142
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: g10/mainproc.c:2153
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
+#: g10/mainproc.c:2154
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:2155
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:2157
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
+#: g10/mainproc.c:2192
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr "WARNING: not a detached signature; file ‘[1m%s[0m’ was NOT verified!\n"
+
+#: g10/mainproc.c:2222
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
+#: g10/mainproc.c:2368
+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:2377
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: g10/mainproc.c:2462
+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 ‘[1m%s[0m’ 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:1144
++#: g10/misc.c:1147
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
- #: g10/misc.c:1148
++#: g10/misc.c:1151
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
- #: g10/misc.c:1150
++#: g10/misc.c:1153
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
- #: g10/misc.c:1157
++#: g10/misc.c:1160
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated command - do not use it\n"
+
- #: g10/misc.c:1167
++#: g10/misc.c:1170
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+"%s:%u: “[1m%s[0m” is obsolete in this file - it only has effect in %s\n"
+
- #: g10/misc.c:1171
++#: g10/misc.c:1174
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “[1m%s%s[0m” is an obsolete option - it has no effect except on %s\n"
+
- #: g10/misc.c:1235
++#: g10/misc.c:1238
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1385
++#: g10/misc.c:1388
+#, 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:1560
++#: g10/misc.c:1563
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1585
++#: g10/misc.c:1588
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1823
++#: g10/misc.c:1826
+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:1845
++#: g10/misc.c:1848
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘[1m%s[0m’\n"
+
- #: g10/openfile.c:84
++#: g10/openfile.c:78
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
- #: g10/openfile.c:88
++#: g10/openfile.c:82
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
- #: g10/openfile.c:123
++#: g10/openfile.c:117
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
- #: g10/openfile.c:147
++#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
- #: g10/openfile.c:218
++#: g10/openfile.c:212
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
- #: g10/openfile.c:366
++#: g10/openfile.c:360
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "new configuration file ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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:1184
++#: g10/parse-packet.c:1187
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
+#, 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:261 g10/passphrase.c:294
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:244
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:255
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:493
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:500
+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:504
+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:509
+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:512
+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:517
+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:520
+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:529
+#, c-format
+msgid ""
+"%s\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+"%s"
+msgstr ""
+"%s\n"
+"“[1m%.*s[0m”\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 "‘[1m%s[0m’ 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:759
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:761
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:760
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:762
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:763
+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 “[1m%s[0m”\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:788
+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 ‘[1m%s[0m’\n"
+
+#: g10/pkclist.c:620
+#, c-format
+msgid "Note: Signer's address '%s' does not match DNS entry\n"
+msgstr "Note: Signer's address ‘[1m%s[0m’ 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 ‘[1m%s[0m’\n"
+
+#: g10/pkclist.c:1002
+#, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "option ‘[1m%s[0m’ 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 ‘[1m%s[0m’ given, but option ‘[1m%s[0m’ 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 “[1m-r[0m”)\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 “[1m%s[0m”\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 “[1m--output[0m” 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 ‘[1m%s[0m’\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:283
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:311
+#, 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:355
+#, 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:388
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:395
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:143
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:311
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:315
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:321
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:326
+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:335 g10/revoke.c:729
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:351 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:414
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:420
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\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 “[1mkill switch[0m” 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 “[1m--generate-revocation[0m” 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:592
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘[1m%s.rev[0m’\n"
+
+#: g10/revoke.c:636
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “[1m%s[0m” 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:663
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:690
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:713
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:737
+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:771
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:781
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:783
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:824
+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:852
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:854
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:859
+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:144
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:171
+#, 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:173
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:183
+#, 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:303
+#, 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:312
+#, 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:326 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:335
+#, 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:352
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:363
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:497
+#, 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:1088
+#, 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:1091
+#, 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: “[1m%s[0m”\n"
+
+#: g10/sign.c:890
+#, 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:1021
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1298
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
+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
++#: g10/skclist.c:213
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
- #: g10/skclist.c:206
++#: g10/skclist.c:232
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:225
++#: g10/skclist.c:251
+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 “[1mgpg --import-ownertrust[0m” 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:221
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:225
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: 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 ‘[1m%s[0m’\n"
+
+#: g10/tdbio.c:146
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘[1m%s[0m’\n"
+
+#: g10/tdbio.c:205 g10/tdbio.c:1789
+#, 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:1800
+#, 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:683
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:725
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:730
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:733
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:789
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:798
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:835
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:843
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:866 g10/tdbio.c:892 g10/tdbio.c:910 g10/tdbio.c:930
+#: g10/tdbio.c:965 g10/tdbio.c:1713 g10/tdbio.c:1742
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:939
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1463
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1474
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1499
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1524
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1530
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1750
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1759
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1770
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1806
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1867
+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 ‘[1multimately_trusted_keys[0m’ 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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
+#, 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 ‘[1mencryptions[0m’ 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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
+#, 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 “[1m%s[0m” 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 “[1m%s[0m” is associated with %d key!"
+msgstr[1] "The email address “[1m%s[0m” 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 “[1m%s[0m”."
+
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
+#, 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 “[1m%s[0m” is associated with %d key:\n"
+msgstr[1] "The email address “[1m%s[0m” is associated with %d keys:\n"
+
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr "Statistics for keys with the email address “[1m%s[0m”:\n"
+
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ", "
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
+#, 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
++#: g10/tofu.c:1828
+#, 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
++#: g10/tofu.c:1835
+#, 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
++#: g10/tofu.c:1839
+#, 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
++#: g10/tofu.c:1853
+#, 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
++#: g10/tofu.c:1859
+#, 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
++#: g10/tofu.c:1869
+#, 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
++#: g10/tofu.c:1875
+#, 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
++#: g10/tofu.c:1885
+#, 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
++#: g10/tofu.c:1891
+#, 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
++#: g10/tofu.c:1899
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
+#, 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
++#: g10/tofu.c:1920
+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
++#: g10/tofu.c:1962
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
+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
++#: g10/tofu.c:1976
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
+#, 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:2823
++#: g10/tofu.c:2827
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
+#, c-format
+msgid "%s: Verified 0~signatures and encrypted 0~messages."
+msgstr "%s: Verified 0~signatures and encrypted 0~messages."
+
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
+#, 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:3164
++#: g10/tofu.c:3168
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
+#, 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:3183
++#: g10/tofu.c:3187
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
+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:3217
++#: g10/tofu.c:3224
+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:3221
++#: g10/tofu.c:3228
+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:3224
++#: g10/tofu.c:3231
+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:3253
++#: g10/tofu.c:3260
+#, 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:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
+#, 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"
+
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
+#, c-format
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "error setting policy for key %s, user id “[1m%s[0m”: %s"
+
+#: g10/trustdb.c:216
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘[1m%s[0m’ 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: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:494
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:543
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:549 g10/trustdb.c:2233
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:558
+#, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "no need for a trustdb check with ‘[1m%s[0m’ trust model\n"
+
+#: g10/trustdb.c:574
+#, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "no need for a trustdb update with ‘[1m%s[0m’ trust model\n"
+
+#: g10/trustdb.c:798 g10/trustdb.c:1382
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1015
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1020
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1954
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1957
+#, 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:2027
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:2041
+#, 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:2159
+#, 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:2240
+#, 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:116
+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:203
+#, 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:252
+#, 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:3365
+#, 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:3377
+#, 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:2122 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:2294 scd/app-openpgp.c:2311 scd/app-openpgp.c:2575
+#: scd/app-openpgp.c:2622 scd/app-openpgp.c:2727 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:2656 scd/app-dinsig.c:531
+#, 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:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1335
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1342
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1452
+msgid "response does not contain the EC public key\n"
+msgstr "response does not contain the EC public key\n"
+
+#: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1652
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#. TRANSLATORS: Put a \x1f right before a colon. This can be
+#. * used by pinentry to nicely align the names and values. Keep
+#. * the %s at the start and end of the string.
+#: scd/app-openpgp.c:1991
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
+#: scd/app-openpgp.c:2004
+#, 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:2020
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: scd/app-openpgp.c:2076
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:2083
+#, 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:2096
+msgid "||Please unlock the card"
+msgstr "||Please unlock the card"
+
+#: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
+#, 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:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
+#: scd/app-openpgp.c:4282
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:2233
+#, 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 (single percent) for a linefeed.
+#: scd/app-openpgp.c:2243
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:2265
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2569
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:2618
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
+#, 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:2651
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2652
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2652
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2723
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2724
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2796
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2800
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2802
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2804
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
+#, 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:3528 scd/app-openpgp.c:3803
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3691
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3958
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3966
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3972
+#, 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:4006
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:4056
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:4172
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:4257
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4726
+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:5027 scd/app-openpgp.c:5038
+#, 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:528
+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:180
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:133
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:135
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:137
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:140
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: 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:149
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:154
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:157
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c:291
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:293
+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:793
+msgid "please use the option '--daemon' to run the program in the background\n"
+msgstr ""
+"please use the option ‘[1m--daemon[0m’ to run the program in the background\n"
+
+#: scd/scdaemon.c:1165 dirmngr/dirmngr.c:1992
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
+#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\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: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: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: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: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: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 “[1mdirmngr[0m” 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: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: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: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: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: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:630
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: 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:668
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
+#: 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: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: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: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:707
+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"
+"“[1m%s[0m”\n"
+"S/N %s, ID 0x%08lX,\n"
+"created %s, expires %s.\n"
+
+#: 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: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: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: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: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: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:1146
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
+#: 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 ‘[1m%.*s[0m’\n"
+
+#: sm/certreqgen.c:508
+#, c-format
+msgid "line %d: invalid subject name '%s' at pos %d\n"
+msgstr "line %d: invalid subject name ‘[1m%s[0m’ 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 ‘[1m%.*s[0m’\n"
+
+#: sm/certreqgen.c:563
+#, c-format
+msgid "line %d: invalid issuer name '%s' at pos %d\n"
+msgstr "line %d: invalid issuer name ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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: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:158
+#, c-format
+msgid " (%d) RSA\n"
+msgstr " (%d) RSA\n"
+
+#: sm/certreqgen-ui.c:159
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: 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: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:233
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serial number of the card: %s\n"
+
+#: sm/certreqgen-ui.c:245
+msgid "Available keys:\n"
+msgstr "Available keys:\n"
+
+#: 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:277
+#, c-format
+msgid " (%d) sign, encrypt\n"
+msgstr " (%d) sign, encrypt\n"
+
+#: sm/certreqgen-ui.c:278
+#, c-format
+msgid " (%d) sign\n"
+msgstr " (%d) sign\n"
+
+#: sm/certreqgen-ui.c:279
+#, c-format
+msgid " (%d) encrypt\n"
+msgstr " (%d) encrypt\n"
+
+#: sm/certreqgen-ui.c:303
+msgid "Enter the X.509 subject name: "
+msgstr "Enter the X.509 subject name: "
+
+#: sm/certreqgen-ui.c:307
+msgid "No subject name given\n"
+msgstr "No subject name given\n"
+
+#: sm/certreqgen-ui.c:311
+#, c-format
+msgid "Invalid subject name label '%.*s'\n"
+msgstr "Invalid subject name label ‘[1m%.*s[0m’\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:320
+#, c-format
+msgid "Invalid subject name '%s'\n"
+msgstr "Invalid subject name ‘[1m%s[0m’\n"
+
+#: 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:334
+msgid "Enter email addresses"
+msgstr "Enter email addresses"
+
+#: sm/certreqgen-ui.c:335
+msgid " (end with an empty line):\n"
+msgstr " (end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:339
+msgid "Enter DNS names"
+msgstr "Enter DNS names"
+
+#: 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:344
+msgid "Enter URIs"
+msgstr "Enter URIs"
+
+#: sm/certreqgen-ui.c:351
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Create self-signed certificate? (y/N) "
+
+#: sm/certreqgen-ui.c:378
+msgid "These parameters are used:\n"
+msgstr "These parameters are used:\n"
+
+#: sm/certreqgen-ui.c:396
+msgid "Now creating self-signed certificate. "
+msgstr "Now creating self-signed certificate. "
+
+#: sm/certreqgen-ui.c:398
+msgid "Now creating certificate request. "
+msgstr "Now creating certificate request. "
+
+#: sm/certreqgen-ui.c:399
+msgid "This may take a while ...\n"
+msgstr "This may take a while ...\n"
+
+#: sm/certreqgen-ui.c:410
+msgid "Ready.\n"
+msgstr "Ready.\n"
+
+#: 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:419
+msgid "resource problem: out of core\n"
+msgstr "resource problem: out of core\n"
+
+#: sm/decrypt.c:339
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: 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 ‘[1m%s[0m’ 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 ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “[1m%s[0m” 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:809
+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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\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: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:531 sm/import.c:563
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:751 tools/gpg-connect-agent.c: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:669
+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"
+"“[1m%s[0m”\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: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"
+"“[1m%s[0m”\n"
+"Note, that this certificate will NOT create a qualified signature!"
+
+#: 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: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:520
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:457
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:461
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:462
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: 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:602
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:603
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:621
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: 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: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: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: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:293
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
+#: 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:417 dirmngr/certcache.c:503 dirmngr/certcache.c:617
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘[1m%s[0m’ already cached\n"
+
+#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:626
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:423
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:628
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:631
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:632
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:620
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:804
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:806
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
+#: dirmngr/certcache.c:808
+#, c-format
+msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
+msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
+
+#: dirmngr/certcache.c:827 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:829
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:831 dirmngr/certcache.c:851
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:914
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘[1m%s[0m’\n"
+
+#: dirmngr/certcache.c:1360 dirmngr/certcache.c:1369
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
+#: dirmngr/certcache.c:1521 dirmngr/certcache.c:1530
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
+#: dirmngr/certcache.c:1636 dirmngr/validate.c:483
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1646
+#, 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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:284
+#, c-format
+msgid "not removing file '%s'\n"
+msgstr "not removing file ‘[1m%s[0m’\n"
+
+#: 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 ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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 ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:623
+#, c-format
+msgid "invalid line detected in '%s' line %u\n"
+msgstr "invalid line detected in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:632
+#, c-format
+msgid "duplicate entry detected in '%s' line %u\n"
+msgstr "duplicate entry detected in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:647
+#, c-format
+msgid "unsupported record type in '%s' line %u skipped\n"
+msgstr "unsupported record type in ‘[1m%s[0m’ line %u skipped\n"
+
+#: dirmngr/crlcache.c:673
+#, c-format
+msgid "invalid issuer hash in '%s' line %u\n"
+msgstr "invalid issuer hash in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:679
+#, c-format
+msgid "no issuer DN in '%s' line %u\n"
+msgstr "no issuer DN in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:686
+#, c-format
+msgid "invalid timestamp in '%s' line %u\n"
+msgstr "invalid timestamp in ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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 ‘[1m%s[0m’ 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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\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 ‘[1m%s[0m’ 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:914
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘[1m%s[0m’\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:176
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:423
+#, 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: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:2003
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: 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:2044
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘[1m%s[0m’\n"
+
+#: 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:2058
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2068
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: 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:2085
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: 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: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:2130
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2140
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2191
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:2223
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘[1m%s[0m’ to '%s': %s\n"
+
+#: 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:2274
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: 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: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:2303
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: 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:2328
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2335
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2346
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: 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:2380
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: 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:2512
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: 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:183
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “[1mhttp[0m” instead of “[1mhttps[0m”\n"
+
+#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:293 dirmngr/crlfetch.c:331
+#: dirmngr/crlfetch.c:363
+#, 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:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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:253 dirmngr/ocsp.c:220
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘[1m%s[0m’ redirected to ‘[1m%s[0m’ (%u)\n"
+
+#: dirmngr/crlfetch.c:272 dirmngr/ocsp.c:237
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:278
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:283
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:300 dirmngr/crlfetch.c:326 dirmngr/crlfetch.c:358
+#: dirmngr/crlfetch.c:385
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:390
+#, 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 ‘[1m%s[0m’ 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: ‘[1m%s[0m’\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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr.c:164
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
+#: dirmngr/dirmngr.c:165
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
+#: dirmngr/dirmngr.c:166
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
+#: dirmngr/dirmngr.c:167
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
+#: dirmngr/dirmngr.c:168
+msgid "flush the cache"
+msgstr "flush the cache"
+
+#: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: dirmngr/dirmngr.c:184
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
+#: dirmngr/dirmngr.c:185
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
+#: dirmngr/dirmngr.c:186
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:188
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
+#: dirmngr/dirmngr.c:189
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
+#: dirmngr/dirmngr.c:190
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:192
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
+#: dirmngr/dirmngr.c:194
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:196
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:199
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
+#: dirmngr/dirmngr.c:201
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
+#: dirmngr/dirmngr.c:203
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
+#: dirmngr/dirmngr.c:206
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
+#: dirmngr/dirmngr.c:208
+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:211 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
+#: dirmngr/dirmngr.c:214
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
+#: dirmngr/dirmngr.c:216
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
+#: dirmngr/dirmngr.c:222
+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:227
+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:229
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
+#: dirmngr/dirmngr.c:254
+msgid ""
+"@\n"
+"(See the \"info\" manual for a complete listing of all commands and "
+"options)\n"
+msgstr ""
+"@\n"
+"(See the “[1minfo[0m” manual for a complete listing of all commands and "
+"options)\n"
+
+#: dirmngr/dirmngr.c:384
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
+#: dirmngr/dirmngr.c:386
+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:466
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
+#: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
+#: tools/gpgconf.c:670
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
+#: dirmngr/dirmngr.c:1151
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
+#: dirmngr/dirmngr.c:1377 dirmngr/server.c:1632
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr.c:1383 dirmngr/server.c:1638
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr.c:1574
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
+#: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
+#: dirmngr/dirmngr.c:1720
+#, 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:1787
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1826
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1831
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: dirmngr/dirmngr.c:1833
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
+#: dirmngr/dirmngr.c:1838
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1846
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: dirmngr/dirmngr.c:1853
+#, 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 ‘[1m%s[0m’\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 ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:475
+#, c-format
+msgid "attribute '%s' not found\n"
+msgstr "attribute ‘[1m%s[0m’ not found\n"
+
+#: dirmngr/dirmngr_ldap.c:482
+#, c-format
+msgid "found attribute '%s'\n"
+msgstr "found attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:591
+#, c-format
+msgid "processing url '%s'\n"
+msgstr "processing url ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:593
+#, c-format
+msgid " user '%s'\n"
+msgstr " user ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:595
+#, c-format
+msgid " pass '%s'\n"
+msgstr " pass ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:597
+#, c-format
+msgid " host '%s'\n"
+msgstr " host ‘[1m%s[0m’\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 ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:602
+#, c-format
+msgid " filter '%s'\n"
+msgstr " filter ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
+#, c-format
+msgid " attr '%s'\n"
+msgstr " attr ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:616
+#, c-format
+msgid "no host name in '%s'\n"
+msgstr "no host name in ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:621
+#, c-format
+msgid "no attribute given for query '%s'\n"
+msgstr "no attribute given for query ‘[1m%s[0m’\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 ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:686
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:718
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘[1m%s[0m’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:724
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘[1m%s[0m’ 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 ‘[1m%s:%d[0m’ to the ldap server list\n"
+
+#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:617
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
+#: 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:172
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: 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: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: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:183
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:209 dirmngr/ocsp.c:257
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:242
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:267
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:290 dirmngr/ocsp.c:300
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘[1m%s[0m’ status: %s\n"
+
+#: dirmngr/ocsp.c:295
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/ocsp.c:330
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:415
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
+#: dirmngr/ocsp.c:466
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
+#: dirmngr/ocsp.c:481
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
+#: dirmngr/ocsp.c:516
+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:555 dirmngr/validate.c:648
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
+#: dirmngr/ocsp.c:565
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
+#: dirmngr/ocsp.c:572
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
+#: dirmngr/ocsp.c:582
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
+#: dirmngr/ocsp.c:616
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: dirmngr/ocsp.c:623
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
+#: dirmngr/ocsp.c:629
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
+#: dirmngr/ocsp.c:636
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘[1m%s[0m’\n"
+
+#: dirmngr/ocsp.c:641
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘[1m%s[0m’\n"
+
+#: dirmngr/ocsp.c:648
+#, 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:678
+#, 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:703
+#, 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:704
+msgid "good"
+msgstr "good"
+
+#: dirmngr/ocsp.c:710
+#, 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:745
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
+#: dirmngr/ocsp.c:757
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
+#: dirmngr/ocsp.c:772
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
+#: 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:985
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
+#: dirmngr/server.c:1059
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
+#: 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:1324
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
+#: 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:1474
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
+#: dirmngr/server.c:1507
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
+#: dirmngr/server.c:1534
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
+#: 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:2591
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
+#: 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: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:2651
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
+#: dirmngr/server.c:2670
+#, c-format
+msgid "Assuan processing failed: %s\n"
+msgstr "Assuan processing failed: %s\n"
+
+#: 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:264
+msgid "CRL checking too deeply nested\n"
+msgstr "CRL checking too deeply nested\n"
+
+#: dirmngr/validate.c:282
+msgid "not checking CRL for"
+msgstr "not checking CRL for"
+
+#: dirmngr/validate.c:287
+msgid "checking CRL for"
+msgstr "checking CRL for"
+
+#: dirmngr/validate.c:556
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
+#: 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:769
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
+#: 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:179
+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 “[1m%s[0m” 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 “[1m%s[0m” ignored due to “[1m%s[0m”\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 ‘[1m%s[0m’\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:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:789 tools/gpgconf-comp.c:898
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:512 tools/gpgconf-comp.c:654 tools/gpgconf-comp.c:731
+#: tools/gpgconf-comp.c:818 tools/gpgconf-comp.c:911
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:540
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:564
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
+#: tools/gpgconf-comp.c:571
+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:575
+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:579
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:583
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:587
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:591
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:708
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:749
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:752
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:803
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:806
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:839
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:888
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:930
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:943
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:957
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:968
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:973
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:1002
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:1010
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1091
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: tools/gpgconf-comp.c:1092
+msgid "Private Keys"
+msgstr "Private Keys"
+
+#: tools/gpgconf-comp.c:1093
+msgid "Smartcards"
+msgstr "Smartcards"
+
+#: tools/gpgconf-comp.c:1094
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:1095
+msgid "Network"
+msgstr "Network"
+
+#: tools/gpgconf-comp.c:1096
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1287
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3410
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3561
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf-comp.c:4135
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘[1m%s[0m’\n"
+
+#: tools/gpgconf-comp.c:4137
+#, c-format
+msgid "error parsing '%s'\n"
+msgstr "error parsing ‘[1m%s[0m’\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:554 tools/gpgconf.c:589
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
+#: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
+msgid "Component not found"
+msgstr "Component not found"
+
+#: tools/gpgconf.c:672
+msgid "No argument allowed"
+msgstr "No argument allowed"
+
+#: tools/symcryptrun.c:166
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@\n"
+"Commands:\n"
+" "
+
+#: tools/symcryptrun.c:168
+msgid "decryption modus"
+msgstr "decryption modus"
+
+#: tools/symcryptrun.c:169
+msgid "encryption modus"
+msgstr "encryption modus"
+
+#: tools/symcryptrun.c:173
+msgid "tool class (confucius)"
+msgstr "tool class (confucius)"
+
+#: tools/symcryptrun.c:174
+msgid "program filename"
+msgstr "program filename"
+
+#: tools/symcryptrun.c:176
+msgid "secret key file (required)"
+msgstr "secret key file (required)"
+
+#: tools/symcryptrun.c:177
+msgid "input file name (default stdin)"
+msgstr "input file name (default stdin)"
+
+#: tools/symcryptrun.c:221
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Usage: symcryptrun [options] (-h for help)"
+
+#: tools/symcryptrun.c:224
+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:290
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
+#: tools/symcryptrun.c:297
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
+#: tools/symcryptrun.c:329
+#, c-format
+msgid "can't create temporary directory '%s': %s\n"
+msgstr "can't create temporary directory '%s': %s\n"
+
+#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
+#: tools/symcryptrun.c:397
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
+#: tools/symcryptrun.c:404
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
+#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
+#: tools/symcryptrun.c:502
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
+#: tools/symcryptrun.c:508
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
+#: tools/symcryptrun.c:514
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
+#: tools/symcryptrun.c:525
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
+#: tools/symcryptrun.c:543
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
+#: tools/symcryptrun.c:550
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
+#: tools/symcryptrun.c:566
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
+#: tools/symcryptrun.c:594
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
+#: tools/symcryptrun.c:623
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
+#: tools/symcryptrun.c:640
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
+#: tools/symcryptrun.c:692
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
+#: tools/symcryptrun.c:744
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
+#: tools/symcryptrun.c:758
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
+#: tools/symcryptrun.c:813
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
+#: tools/symcryptrun.c:826
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
+#: tools/symcryptrun.c:999
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1021
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1030
+#, 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 ea8eb94,0000000..b2dcbf3
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10702 -1,0 +1,10688 @@@
+# 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.20\n"
++"Project-Id-Version: GNU gnupg 2.1.21\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
- "PO-Revision-Date: 2017-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\n"
++"PO-Revision-Date: 2017-05-15 16:15+0200\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: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:499
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:500
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:501
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:502
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:503
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:504
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: 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:507
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: 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: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:861
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: 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: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:1029 agent/call-pinentry.c:1208
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
+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:1076
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:1087
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1117
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1125
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1130
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1143
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1143
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
+#, 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:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
- #: agent/command-ssh.c:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
+#, c-format
+msgid "error getting list of cards: %s\n"
+msgstr "error getting list of cards: %s\n"
+
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
+#, 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:2788
++#: agent/command-ssh.c:2781
+msgid "Allow"
+msgstr "Allow"
+
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
+msgid "Deny"
+msgstr "Deny"
+
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
+#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
+#, 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:3641
++#: agent/command-ssh.c:3635
+#, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "failed to create stream from socket: %s\n"
+
+#: agent/divert-scd.c:115
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:116
+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:244
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:249
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:256
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: 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:354
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:356
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:357
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: 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:364
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:365
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: 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: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:150 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:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
+#: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
+#: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
+msgid "verbose"
+msgstr "verbose"
+
+#: agent/gpg-agent.c:158 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
+#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
+#: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
+#: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
+#: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
+#: agent/gpg-agent.c:171
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: agent/gpg-agent.c:172 tools/symcryptrun.c:180
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
+#: agent/gpg-agent.c:174
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: agent/gpg-agent.c:179
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:181
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:185
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:201
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: agent/gpg-agent.c:203
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
+#: agent/gpg-agent.c:206
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: agent/gpg-agent.c:220
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
+#: agent/gpg-agent.c:222
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: agent/gpg-agent.c:224
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
+#: agent/gpg-agent.c:227
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:229
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
+#: agent/gpg-agent.c:232
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
+#: agent/gpg-agent.c:234
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:237
+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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
+#: agent/gpg-agent.c:494
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
+#: agent/gpg-agent.c:496
+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:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘%s’ is not considered an option\n"
+
+#: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
+#: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
+#: agent/gpg-agent.c:2156
+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:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
+#: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
+#: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
+#: dirmngr/dirmngr.c:1215
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
+#: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
+#: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘%s’\n"
+
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 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:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
+#: agent/gpg-agent.c:2266
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
+#: agent/gpg-agent.c:2270
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
+#: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2620
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2625
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
+#: agent/gpg-agent.c:2700
+#, 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:2705
+#, 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: 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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
+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:462
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:722 tools/symcryptrun.c:458
+#, 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:1559
+#: 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:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: 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:283
+#, 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:299
+#, 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:313 agent/findkey.c:320
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:321
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
+#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
+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: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: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: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:1244
+#, 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: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: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: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:865 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:607
+#, 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:3256
+#, 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:1262
+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:805
+#: dirmngr/dirmngr.c:814
+#, 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:423
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:462
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:473
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:486
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:499
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:552
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:687
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:700
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:872 g10/armor.c:1492
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:915
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:949
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:957
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:961 g10/armor.c:1529
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:981
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:985
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1305
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1310
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1314
+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:1210
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
+#: g10/build-packet.c:1262
+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:1274 g10/build-packet.c:1370
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘@’ character\n"
+
+#: g10/build-packet.c:1280 g10/build-packet.c:1376
+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:1298
+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:1354
+msgid "a notation name may not contain an '=' character\n"
+msgstr "a notation name may not contain an ‘=’ character\n"
+
+#: g10/build-packet.c:1360
+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:1419 g10/build-packet.c:1430
+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:170
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:197 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:203 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:209 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:384 g10/card-util.c:1770
+#, 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:1776
+#, 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:1973 g10/delkey.c:128 g10/keyedit.c:2034
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
+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:2612
+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:1536 g10/card-util.c:1652
+#: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
+#: g10/keygen.c:1934 g10/keygen.c:2302 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:534
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:535
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:535
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:562
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:562
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:712
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:714
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
+#: g10/card-util.c:716
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:733
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:735
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:753
+#, 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:774
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:782
+#, 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:877 g10/decrypt-data.c:241 g10/import.c:348
+#: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
+#: dirmngr/dirmngr.c:1597 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:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:937
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:947
+#, 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:983
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:993
+#, 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:1076
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1084
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1093
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1115
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1129
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1151
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1174
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1224
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1225
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1325
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1342
+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:1367
+#, 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:1369
+#, 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:1370
+#, 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:1381 g10/keygen.c:2111 g10/keygen.c:2143
+#: 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:1389 g10/keygen.c:2196 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:1394
+#, 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:1414
+#, 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:1438
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1452
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1455
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1467
+#, 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:1527
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1529 g10/card-util.c:1643
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1530 g10/card-util.c:1645
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1531 g10/card-util.c:1647
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1548 g10/card-util.c:1672 g10/keyedit.c:1512
+#: g10/keygen.c:1799 g10/keygen.c:1827 g10/keygen.c:1941 g10/keygen.c:2049
+#: g10/keygen.c:2325 g10/revoke.c:821
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1640
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1686
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1782
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1787
+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:1790
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1795
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
+#: g10/card-util.c:1881 g10/keyedit.c:1872
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1883
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1884 g10/keyedit.c:1875
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1886
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1889
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1890
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1891
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1892
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1893
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1894
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1895
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1896
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1897
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1898
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1899
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1900
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1901
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:2025
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:2066
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2097
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2099
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2194 g10/keyedit.c:2826
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
+#: g10/decrypt.c:190 g10/encrypt.c:958
+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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘%s’\n"
+
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:118 g10/getkey.c:578
+#, 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:202
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:204
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:204
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:227
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:240
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:276
+#, 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:278
+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:233 g10/sign.c:1304
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encrypt.c:240
+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:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
+#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
+#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
+#: g10/encrypt.c:606
+#, 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:708 g10/sign.c:996
+#, 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:818
+#, 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:906
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
+#: g10/encrypt.c:934 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:1235
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘%s’\n"
+
+#: g10/export.c:1708
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:1903
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:1980
+#, 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:2067
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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:256
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
+#: g10/getkey.c:515
+#, 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:545
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
+#: g10/getkey.c:635
+#, 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:1451
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
+#: g10/getkey.c:1457
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
+#: g10/getkey.c:1459
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
+#, 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:1983
++#: g10/getkey.c:1984
+#, 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:1990
++#: g10/getkey.c:1991
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
+#, 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:3636
++#: g10/getkey.c:3637
+#, 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:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:428
++#: g10/gpg.c:431
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:433
++#: g10/gpg.c:436
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:444
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:447
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:455
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:455
++#: g10/gpg.c:458
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:460
++#: g10/gpg.c:463
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
- #: g10/gpg.c:463
++#: g10/gpg.c:466
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:469
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:469
++#: g10/gpg.c:472
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:474
++#: g10/gpg.c:477
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:476
++#: g10/gpg.c:479
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:478
++#: g10/gpg.c:481
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:482
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:480
++#: g10/gpg.c:483
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:481
++#: g10/gpg.c:484
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:487
++#: g10/gpg.c:490
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:488
++#: g10/gpg.c:491
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:489
++#: g10/gpg.c:492
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:492
++#: g10/gpg.c:495
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:494
++#: g10/gpg.c:497
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:500
++#: g10/gpg.c:503
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:503
++#: g10/gpg.c:506
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:504
++#: g10/gpg.c:507
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:506
++#: g10/gpg.c:509
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:518
++#: g10/gpg.c:521
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:527
++#: g10/gpg.c:530
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:532
++#: g10/gpg.c:535
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 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:561
++#: g10/gpg.c:564
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:568
++#: g10/gpg.c:571
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 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:601
++#: g10/gpg.c:604
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:650
++#: g10/gpg.c:653
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 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:679
++#: g10/gpg.c:682
+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:1049
++#: g10/gpg.c:1052
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
+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:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
+#, 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:1587
++#: g10/gpg.c:1590
+#, 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:1590
++#: g10/gpg.c:1593
+#, 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:1596
++#: g10/gpg.c:1599
+#, 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:1599
++#: g10/gpg.c:1602
+#, 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:1602
++#: g10/gpg.c:1605
+#, 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:1818
++#: g10/gpg.c:1821
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
+#, c-format
+msgid "valid values for option '%s':\n"
+msgstr "valid values for option '%s':\n"
+
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘%s’\n"
+
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
+#, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "invalid value for option ‘%s’\n"
+
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
+#, c-format
+msgid "\"%s\" is not a proper mail address\n"
+msgstr "“%s” is not a proper mail address\n"
+
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
+#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
+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:3744
++#: g10/gpg.c:3747
+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:3746
++#: g10/gpg.c:3749
+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:3749
++#: g10/gpg.c:3752
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
+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:3760
++#: g10/gpg.c:3763
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
+#, 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:3860
++#: g10/gpg.c:3863
+#, 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:3865
++#: g10/gpg.c:3868
+#, 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:3969
++#: g10/gpg.c:3972
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
+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:4053
++#: g10/gpg.c:4056
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
+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:4085
++#: g10/gpg.c:4088
+#, 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:4142
++#: g10/gpg.c:4145
+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:4145
++#: g10/gpg.c:4148
+#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
+#, 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:4928
++#: g10/gpg.c:4931
+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:4939
++#: g10/gpg.c:4942
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: 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:82
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: 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:89
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:148
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: 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:584
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:601
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:671
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:674
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:676
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:679
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:682 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:686 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:688
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:690
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:692
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:694
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:696 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:698 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:700 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:702 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:704
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:706
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:1059
+#, 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:1101
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:1116
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:1128
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:1141
+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:1143
+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:1168
+#, 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:1443 g10/import.c:2233
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:1449
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:1450 g10/import.c:2207
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1482
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1500
+#, 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:1510 g10/import.c:1541
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1512
+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:1582 g10/import.c:2384
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1588
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:1603
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:1612 g10/import.c:1713 g10/import.c:2450
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
+#: g10/import.c:1632
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
+#: g10/import.c:1656
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:1672 g10/import.c:2408
+#, 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:1680 g10/import.c:2415
+#, 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:1723
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
+#: g10/import.c:1726
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
+#: g10/import.c:1729
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
+#: g10/import.c:1732
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
+#: g10/import.c:1735
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
+#: g10/import.c:1738
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
+#: g10/import.c:1741
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
+#: g10/import.c:1744
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
+#: g10/import.c:1747
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
+#: g10/import.c:1750
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
+#: g10/import.c:1773
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
+#: g10/import.c:2085 g10/import.c:2330
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:2093
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
+#: g10/import.c:2101
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
+#: g10/import.c:2206
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:2226 g10/import.c:2261
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:2250
+#, 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:2322
+#, 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:2377
+#, 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:2426
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:2459
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
+#: g10/import.c:2535
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:2552
+#, 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:2554
+#, 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:2571 g10/import.c:2597 g10/import.c:2648
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:2572
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:2586
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:2599
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:2615
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:2637
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:2650
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:2665
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:2708
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
+#: g10/import.c:2732
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:2761
+#, 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:2772
+#, 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:2790
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:2804
+#, 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:2812
+#, 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:2954
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:3018
+#, 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:3034
+#, 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:3098
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
+#: g10/import.c:3136
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:425 g10/keydb.c:452 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:428 g10/keydb.c:455
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:464 sm/keydb.c:232
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
+#: g10/keydb.c:466
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
+#: g10/keydb.c:844
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:950
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1750
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:268
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:268
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 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:633
+#, 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:642
+#, 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:805
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
+#: g10/keyedit.c:918
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
+#: g10/keyedit.c:921
+#, 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:924 g10/keylist.c:481
+#, 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:928 g10/keylist.c:477
+#, 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:932
+#, 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:937
+#, 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:997 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:1001 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:1002 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:1020
+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:1037
+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:1165
+#, 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:1173
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
+#: g10/keyedit.c:1182 g10/keyedit.c:1210 g10/keyedit.c:1237 g10/keyedit.c:1421
+#: g10/keyedit.c:2253
+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:1196 g10/keyedit.c:1224 g10/keyedit.c:1251 g10/keyedit.c:1427
+#: g10/keyedit.c:2258 g10/keyedit.c:3261
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:1201
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
+#: g10/keyedit.c:1229
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
+#: g10/keyedit.c:1258
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
+#: g10/keyedit.c:1260
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:1287
+#, 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:1296
+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:1309
+#, 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:1314
+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:1335
+#, 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:1340
+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:1360
+#, 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:1364
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
+#: g10/keyedit.c:1369
+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:1391
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:1415
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:1433
+#, 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:1439
+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:1480
+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:1485
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:1487
+#, 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:1489
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:1492
+#, 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:1499
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
+#: g10/keyedit.c:1526
+#, 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:1534
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:1539
+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:1546
+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:1556
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:1563
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:1570
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1575
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1580
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1592
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1643 g10/keyedit.c:6399 g10/keyedit.c:6482 g10/keyedit.c:6611
+#: g10/keyedit.c:6673 g10/sign.c:325
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1730
+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:1760
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1874
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1877
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1878
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1879
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1881
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1882
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1883
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1889
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1894
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1895
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1897
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1899
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1901
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1902
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1905
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1908
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1910
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1912
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1914
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1916
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1918
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1920
+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:1922
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1925
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1926
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1928
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1931
+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:1933
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1935
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1938
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1941
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1943
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1946
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1948
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1949
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1951
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1953
+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:1955
+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:2067
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:2167
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:2188
+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:2246 g10/keyedit.c:3261 g10/keyedit.c:3400 g10/keyedit.c:3462
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:2269
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:2273
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:2281
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:2292
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
+#: g10/keyedit.c:2316
+#, 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:2338 g10/keyedit.c:2362 g10/keyedit.c:2559
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:2340 g10/keyedit.c:2364 g10/keyedit.c:2521 g10/keyedit.c:2561
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
+#: g10/keyedit.c:2343
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:2346
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2347
+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:2404
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:2416 g10/keyedit.c:5050
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:2444
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:2465
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:2484
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:2519
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:2525
+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:2527
+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:2565
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2566
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2584
+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:2595
+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:2597
+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:2655
+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:2700
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2707
+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:2709
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2783
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2787
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2798 g10/keyedit.c:2808 g10/keyedit.c:2985 g10/keyedit.c:3059
+#: g10/keyedit.c:3127 g10/keyedit.c:3351 g10/keyedit.c:3416 g10/keyedit.c:3492
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2814 g10/keyedit.c:3356 g10/keyedit.c:3421 g10/keyedit.c:3499
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:3046
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:3072
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
+#: g10/keyedit.c:3136
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
+#: g10/keyedit.c:3167
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
+#: g10/keyedit.c:3196
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:3332 g10/keyedit.c:3335
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:3338
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:3338
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:3471
+#, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "‘%s’ is not a valid expiration time\n"
+
+#: g10/keyedit.c:3591
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3648
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3659
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3674 g10/keylist.c:374
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3682 g10/keyedit.c:3683
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3928
+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:4000
+#, 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:4024
+#, 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:4030
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:4072 g10/keyedit.c:4214 g10/keylist.c:262 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:4075 g10/keylist.c:1888
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:4077 g10/keylist.c:1894
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:4079 g10/keyedit.c:4216 g10/keylist.c:264 g10/keylist.c:1900
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:4081
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:4089 g10/keyedit.c:4109 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:4148
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:4152
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:4159
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:4177
+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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:4352
+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:4404
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:4405
+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:4464
+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:4469 g10/keyedit.c:4759
+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:4475
+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:4490 g10/keygen.c:2708
+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:4592
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4602
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4606
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4613
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4629
+#, 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:4633
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4668 g10/trust.c:731
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4670
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
+#: g10/keyedit.c:4676
+#, 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:4684
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
+#: g10/keyedit.c:4685
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
+#: g10/keyedit.c:4754
+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:4765
+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:4782
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4807
+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:4822
+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:4844
+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:4862
+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:4868
+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:4932
+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:4937
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4940
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4994
+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:5173
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:5179
+#, 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:5296
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:5337 g10/keyedit.c:5451 g10/keyedit.c:5564 g10/keyedit.c:5702
+#, 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:5508
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5587
+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:5588
+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:5648
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5795
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5865
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5927
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:6028
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:6050
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:6191
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
+#: g10/keyedit.c:6194 g10/keyedit.c:6296 g10/keyedit.c:6344
+#, 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:6196 g10/keyedit.c:6298 g10/keyedit.c:6346
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:6200
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:6205
+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:6210
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:6264
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:6270
+#, 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:6299
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:6306
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:6331
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:6354
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:6387
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:6435
+#, 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:6445
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
+#: g10/keyedit.c:6462
+#, 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:6558
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:6596
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6658
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6755
+#, 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:317
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:324
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:326
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:328
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: 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:950
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:996
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1053
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1418 g10/keygen.c:1423 g10/keygen.c:1475 g10/keygen.c:1480
+#: g10/keygen.c:1627 g10/keygen.c:1632
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1429 g10/keygen.c:1486 g10/keygen.c:1494 g10/keygen.c:1638
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1520
+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:1694
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1697
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1700
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1703
+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:1722
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1749
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1755
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1760
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1763
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1766
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1769
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1882 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:1886
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1893
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1901
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1911
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1917
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1919
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1921
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1923
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1927
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2023 sm/certreqgen-ui.c:202
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2036 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:2038 sm/certreqgen-ui.c:212
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2122 g10/keygen.c:2136
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2177
+#, 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:2185
+#, 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:2188 sm/certreqgen-ui.c:179
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2202 sm/certreqgen-ui.c:189
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2248
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2420
+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:2431
+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:2454
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2459
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2472 g10/keygen.c:2497
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2479
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2480
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2485
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2486
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2490
+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:2503
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2571
+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:2586
+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:2605
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2614
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2615
+#, 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:2619
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2622
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2632
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2638
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2647
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2653
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2689
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
+#: g10/keygen.c:2695
+#, 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:2700
+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:2725
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2735
+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:2736
+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:2741
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2742
+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:2761
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2807
+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:3903 g10/keygen.c:3970 g10/keygen.c:3987 g10/keygen.c:4010
+#: g10/keygen.c:4349 g10/keygen.c:4833 g10/keygen.c:5094 g10/keygen.c:5199
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3912
+#, 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:3914
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
+#: g10/keygen.c:3935
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
+#: g10/keygen.c:3940
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
+#: g10/keygen.c:3946
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
+#: g10/keygen.c:4334
+#, 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:4377
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:4437
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
+#: g10/keygen.c:4457
+#, 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:4611 g10/keygen.c:4767
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
+#: g10/keygen.c:4761
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:4775
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
+#: g10/keygen.c:4808
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:4820
+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:4966 g10/keygen.c:5150
+#, 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:4968 g10/keygen.c:5152
+#, 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:4979 g10/keygen.c:5163
+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:4991 g10/keygen.c:4993
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keygen.c:5000 g10/keygen.c:5002
+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:5021 g10/keygen.c:5177
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:665 g10/keyid.c:678 g10/keyid.c:691
+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:473
+#, 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:486
+#, 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:568
+#, 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:590
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1755
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1757
+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:1765
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1767 g10/keylist.c:1777
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1772 g10/keylist.c:1788
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1839
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\n"
+
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
+#, 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:1552
++#: g10/keyring.c:1557
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
+#, 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:1423 g10/keyserver.c:1456
+#, 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:1430
+#, 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:1534
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
+#: g10/keyserver.c:1537
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1541
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1706
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1710
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1811 g10/keyserver.c:1967
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
+#: g10/keyserver.c:1829
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1870
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
+#: g10/keyserver.c:1886
+#, 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:1223 g10/mainproc.c:1266
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1600
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
+#: g10/mainproc.c:1602
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
+#: g10/mainproc.c:1604
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
+#: g10/mainproc.c:1623
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: g10/mainproc.c:1732
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
+#: g10/mainproc.c:1746 g10/mainproc.c:1754
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: g10/mainproc.c:1747 g10/mainproc.c:1755
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
+#: g10/mainproc.c:1759
+#, 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:1765
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “%s”\n"
+
+#: g10/mainproc.c:1782
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:2017
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:2055
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
+#: g10/mainproc.c:2138
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
+#: g10/mainproc.c:2142
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: g10/mainproc.c:2153
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
+#: g10/mainproc.c:2154
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:2155
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:2157
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
+#: g10/mainproc.c:2192
+#, 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:2222
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: g10/mainproc.c:2315 g10/mainproc.c:2334 g10/mainproc.c:2458
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
+#: g10/mainproc.c:2368
+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:2377
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: g10/mainproc.c:2462
+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:1144
++#: g10/misc.c:1147
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
- #: g10/misc.c:1148
++#: g10/misc.c:1151
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
- #: g10/misc.c:1150
++#: g10/misc.c:1153
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
- #: g10/misc.c:1157
++#: g10/misc.c:1160
+#, 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:1167
++#: g10/misc.c:1170
+#, 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:1171
++#: g10/misc.c:1174
+#, 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:1235
++#: g10/misc.c:1238
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1385
++#: g10/misc.c:1388
+#, 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:1560
++#: g10/misc.c:1563
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
- #: g10/misc.c:1585
++#: g10/misc.c:1588
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
- #: g10/misc.c:1823
++#: g10/misc.c:1826
+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:1845
++#: g10/misc.c:1848
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘%s’\n"
+
- #: g10/openfile.c:84
++#: g10/openfile.c:78
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
- #: g10/openfile.c:88
++#: g10/openfile.c:82
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
- #: g10/openfile.c:123
++#: g10/openfile.c:117
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
- #: g10/openfile.c:147
++#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
- #: g10/openfile.c:218
++#: g10/openfile.c:212
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
- #: g10/openfile.c:366
++#: g10/openfile.c:360
+#, 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:1184
++#: g10/parse-packet.c:1187
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
+#, 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:261 g10/passphrase.c:294
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:244
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:255
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:493
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:500
+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:504
+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:509
+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:512
+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:517
+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:520
+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:529
+#, 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:759
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:761
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:760
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:762
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:763
+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:788
+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:283
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:311
+#, 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:355
+#, 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:388
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:395
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:143
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:311
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:315
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:321
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:326
+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:335 g10/revoke.c:729
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:351 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:414
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:420
+#, 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:592
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘%s.rev’\n"
+
+#: g10/revoke.c:636
+#, 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:663
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘%s’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:690
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:713
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:737
+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:771
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:781
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:783
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:824
+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:852
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:854
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:859
+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:144
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:171
+#, 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:173
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:183
+#, 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:303
+#, 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:312
+#, 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:326 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:335
+#, 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:352
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:363
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:497
+#, 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:1088
+#, 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:1091
+#, 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:890
+#, 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:1021
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1298
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
+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
++#: g10/skclist.c:213
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
- #: g10/skclist.c:206
++#: g10/skclist.c:232
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:225
++#: g10/skclist.c:251
+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:221
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:225
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: 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:1789
+#, 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:1800
+#, 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:683
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
+#: g10/tdbio.c:725
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
+#: g10/tdbio.c:730
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
+#: g10/tdbio.c:733
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
+#: g10/tdbio.c:789
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
+#: g10/tdbio.c:798
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
+#: g10/tdbio.c:835
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
+#: g10/tdbio.c:843
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
+#: g10/tdbio.c:866 g10/tdbio.c:892 g10/tdbio.c:910 g10/tdbio.c:930
+#: g10/tdbio.c:965 g10/tdbio.c:1713 g10/tdbio.c:1742
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
+#: g10/tdbio.c:939
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
+#: g10/tdbio.c:1463
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1474
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1499
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
+#: g10/tdbio.c:1524
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
+#: g10/tdbio.c:1530
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbio.c:1750
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
+#: g10/tdbio.c:1759
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
+#: g10/tdbio.c:1770
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
+#: g10/tdbio.c:1806
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
+#: g10/tdbio.c:1867
+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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
+#, 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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
+#, 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
++#: g10/tofu.c:1609
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
+#, 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
++#: g10/tofu.c:1748
+#, 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
++#: g10/tofu.c:1798
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
+#, 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
++#: g10/tofu.c:1828
+#, 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
++#: g10/tofu.c:1835
+#, 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
++#: g10/tofu.c:1839
+#, 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
++#: g10/tofu.c:1853
+#, 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
++#: g10/tofu.c:1859
+#, 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
++#: g10/tofu.c:1869
+#, 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
++#: g10/tofu.c:1875
+#, 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
++#: g10/tofu.c:1885
+#, 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
++#: g10/tofu.c:1891
+#, 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
++#: g10/tofu.c:1899
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
+#, 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
++#: g10/tofu.c:1920
+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
++#: g10/tofu.c:1962
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
+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
++#: g10/tofu.c:1976
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
+#, 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:2823
++#: g10/tofu.c:2827
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
+#, c-format
+msgid "%s: Verified 0~signatures and encrypted 0~messages."
+msgstr "%s: Verified 0~signatures and encrypted 0~messages."
+
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
+#, 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:3164
++#: g10/tofu.c:3168
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
+#, 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:3183
++#: g10/tofu.c:3187
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
+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:3217
++#: g10/tofu.c:3224
+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:3221
++#: g10/tofu.c:3228
+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:3224
++#: g10/tofu.c:3231
+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:3253
++#: g10/tofu.c:3260
+#, 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:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
+#, 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"
+
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
+#, 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: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:494
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:543
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:549 g10/trustdb.c:2233
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:558
+#, 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:574
+#, 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:798 g10/trustdb.c:1382
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1015
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1020
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1954
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1957
+#, 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:2027
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:2041
+#, 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:2159
+#, 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:2240
+#, 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:116
+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:203
+#, 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:252
+#, 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:3365
+#, 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:3377
+#, 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:2122 scd/app-openpgp.c:2141
+#: scd/app-openpgp.c:2294 scd/app-openpgp.c:2311 scd/app-openpgp.c:2575
+#: scd/app-openpgp.c:2622 scd/app-openpgp.c:2727 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:2656 scd/app-dinsig.c:531
+#, 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:1173 scd/app-openpgp.c:2603 scd/app-openpgp.c:4712
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1335
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1342
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1452
+msgid "response does not contain the EC public key\n"
+msgstr "response does not contain the EC public key\n"
+
+#: scd/app-openpgp.c:1552 scd/app-openpgp.c:3981
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1652
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#. TRANSLATORS: Put a \x1f right before a colon. This can be
+#. * used by pinentry to nicely align the names and values. Keep
+#. * the %s at the start and end of the string.
+#: scd/app-openpgp.c:1991
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
+#: scd/app-openpgp.c:2004
+#, 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:2020
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: scd/app-openpgp.c:2076
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:2083
+#, 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:2096
+msgid "||Please unlock the card"
+msgstr "||Please unlock the card"
+
+#: scd/app-openpgp.c:2148 scd/app-openpgp.c:2318 scd/app-openpgp.c:2582
+#, 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:2161 scd/app-openpgp.c:2200 scd/app-openpgp.c:2330
+#: scd/app-openpgp.c:4282
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:2229 scd/app-openpgp.c:4721
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:2233
+#, 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 (single percent) for a linefeed.
+#: scd/app-openpgp.c:2243
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:2265
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2569
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:2618
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2628 scd/app-openpgp.c:2682
+#, 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:2651
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2652
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2652
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2723
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2724
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2780 scd/app-openpgp.c:4041
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2786 scd/app-openpgp.c:4048
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2796
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2800
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2802
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2804
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:3346 scd/app-openpgp.c:3697
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3387 scd/app-openpgp.c:3395
+#, 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:3528 scd/app-openpgp.c:3803
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3691
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3958
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3966
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3972
+#, 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:4006
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:4056
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:4172
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:4257
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4726
+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:5027 scd/app-openpgp.c:5038
+#, 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:528
+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:180
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
+#: scd/scdaemon.c:131 tools/gpgconf-comp.c:659
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:133
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:135
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:137
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:140
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: 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:149
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:154
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:157
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c:291
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
+#: scd/scdaemon.c:293
+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:793
+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:1165 dirmngr/dirmngr.c:1992
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
+#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:1997
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\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: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: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: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: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: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: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: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: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: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: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:630
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: 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:668
+msgid "certificate has a BAD signature"
+msgstr "certificate has a BAD signature"
+
+#: 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: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: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: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:707
+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: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: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: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: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: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: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:1146
+msgid "certificate is not usable for encryption\n"
+msgstr "certificate is not usable for encryption\n"
+
+#: 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: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:158
+#, c-format
+msgid " (%d) RSA\n"
+msgstr " (%d) RSA\n"
+
+#: sm/certreqgen-ui.c:159
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: 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: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:233
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serial number of the card: %s\n"
+
+#: sm/certreqgen-ui.c:245
+msgid "Available keys:\n"
+msgstr "Available keys:\n"
+
+#: 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:277
+#, c-format
+msgid " (%d) sign, encrypt\n"
+msgstr " (%d) sign, encrypt\n"
+
+#: sm/certreqgen-ui.c:278
+#, c-format
+msgid " (%d) sign\n"
+msgstr " (%d) sign\n"
+
+#: sm/certreqgen-ui.c:279
+#, c-format
+msgid " (%d) encrypt\n"
+msgstr " (%d) encrypt\n"
+
+#: sm/certreqgen-ui.c:303
+msgid "Enter the X.509 subject name: "
+msgstr "Enter the X.509 subject name: "
+
+#: sm/certreqgen-ui.c:307
+msgid "No subject name given\n"
+msgstr "No subject name given\n"
+
+#: 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:320
+#, c-format
+msgid "Invalid subject name '%s'\n"
+msgstr "Invalid subject name ‘%s’\n"
+
+#: 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:334
+msgid "Enter email addresses"
+msgstr "Enter email addresses"
+
+#: sm/certreqgen-ui.c:335
+msgid " (end with an empty line):\n"
+msgstr " (end with an empty line):\n"
+
+#: sm/certreqgen-ui.c:339
+msgid "Enter DNS names"
+msgstr "Enter DNS names"
+
+#: 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:344
+msgid "Enter URIs"
+msgstr "Enter URIs"
+
+#: sm/certreqgen-ui.c:351
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Create self-signed certificate? (y/N) "
+
+#: sm/certreqgen-ui.c:378
+msgid "These parameters are used:\n"
+msgstr "These parameters are used:\n"
+
+#: sm/certreqgen-ui.c:396
+msgid "Now creating self-signed certificate. "
+msgstr "Now creating self-signed certificate. "
+
+#: sm/certreqgen-ui.c:398
+msgid "Now creating certificate request. "
+msgstr "Now creating certificate request. "
+
+#: sm/certreqgen-ui.c:399
+msgid "This may take a while ...\n"
+msgstr "This may take a while ...\n"
+
+#: sm/certreqgen-ui.c:410
+msgid "Ready.\n"
+msgstr "Ready.\n"
+
+#: 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:419
+msgid "resource problem: out of core\n"
+msgstr "resource problem: out of core\n"
+
+#: sm/decrypt.c:339
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: 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:809
+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: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:531 sm/import.c:563
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:751 tools/gpg-connect-agent.c: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:669
+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: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: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: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:520
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:457
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:461
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:462
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: 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:602
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:603
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:621
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: 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: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: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: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:293
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
+#: 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:417 dirmngr/certcache.c:503 dirmngr/certcache.c:617
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘%s’ already cached\n"
+
+#: dirmngr/certcache.c:421 dirmngr/certcache.c:511 dirmngr/certcache.c:626
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:423
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:427 dirmngr/certcache.c:513 dirmngr/certcache.c:628
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:430 dirmngr/certcache.c:516 dirmngr/certcache.c:631
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:431 dirmngr/certcache.c:517 dirmngr/certcache.c:632
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:435 dirmngr/certcache.c:505 dirmngr/certcache.c:620
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:804
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:806
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
+#: dirmngr/certcache.c:808
+#, c-format
+msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
+msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
+
+#: dirmngr/certcache.c:827 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:829
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:831 dirmngr/certcache.c:851
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:914
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘%s’\n"
+
+#: dirmngr/certcache.c:1360 dirmngr/certcache.c:1369
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
+#: dirmngr/certcache.c:1521 dirmngr/certcache.c:1530
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
+#: dirmngr/certcache.c:1636 dirmngr/validate.c:483
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1646
+#, 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: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: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:176
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:423
+#, 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: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:2003
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: 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:2044
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘%s’\n"
+
+#: 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:2058
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2068
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: 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:2085
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: 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: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:2130
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2140
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2191
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘%s’\n"
+
+#: 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: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:2274
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: 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: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:2303
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: 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:2328
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2335
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2346
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: 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:2380
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: 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:2512
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: 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:183
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “http” instead of “https”\n"
+
+#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:293 dirmngr/crlfetch.c:331
+#: dirmngr/crlfetch.c:363
+#, 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:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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:253 dirmngr/ocsp.c:220
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
+
+#: dirmngr/crlfetch.c:272 dirmngr/ocsp.c:237
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:278
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:283
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:300 dirmngr/crlfetch.c:326 dirmngr/crlfetch.c:358
+#: dirmngr/crlfetch.c:385
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:390
+#, 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:164
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
+#: dirmngr/dirmngr.c:165
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
+#: dirmngr/dirmngr.c:166
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
+#: dirmngr/dirmngr.c:167
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
+#: dirmngr/dirmngr.c:168
+msgid "flush the cache"
+msgstr "flush the cache"
+
+#: dirmngr/dirmngr.c:183 tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:823 tools/gpgconf-comp.c:919
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: dirmngr/dirmngr.c:184
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
+#: dirmngr/dirmngr.c:185
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
+#: dirmngr/dirmngr.c:186
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:188
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
+#: dirmngr/dirmngr.c:189
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
+#: dirmngr/dirmngr.c:190
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:192
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
+#: dirmngr/dirmngr.c:194
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:196
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:199
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
+#: dirmngr/dirmngr.c:201
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
+#: dirmngr/dirmngr.c:203
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
+#: dirmngr/dirmngr.c:206
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
+#: dirmngr/dirmngr.c:208
+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:211 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
+#: dirmngr/dirmngr.c:214
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
+#: dirmngr/dirmngr.c:216
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
+#: dirmngr/dirmngr.c:222
+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:227
+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:229
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
+#: dirmngr/dirmngr.c:254
+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:384
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
+#: dirmngr/dirmngr.c:386
+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:466
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
+#: dirmngr/dirmngr.c:542 tools/gpgconf.c:552 tools/gpgconf.c:587
+#: tools/gpgconf.c:670
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
+#: dirmngr/dirmngr.c:1151
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
+#: dirmngr/dirmngr.c:1377 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:1383 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:1574
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
+#: dirmngr/dirmngr.c:1629 dirmngr/dirmngr.c:1713
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: dirmngr/dirmngr.c:1665 dirmngr/dirmngr.c:1691 tools/gpgconf-comp.c:4131
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
+#: dirmngr/dirmngr.c:1720
+#, 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:1787
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1826
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1831
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: dirmngr/dirmngr.c:1833
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
+#: dirmngr/dirmngr.c:1838
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1846
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: dirmngr/dirmngr.c:1853
+#, 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:512
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: 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: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:172
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: 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: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: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:183
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:209 dirmngr/ocsp.c:257
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:242
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:267
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:290 dirmngr/ocsp.c:300
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘%s’ status: %s\n"
+
+#: dirmngr/ocsp.c:295
+#, 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:330
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:415
+msgid "only SHA-1 is supported for OCSP responses\n"
+msgstr "only SHA-1 is supported for OCSP responses\n"
+
+#: dirmngr/ocsp.c:466
+#, c-format
+msgid "allocating list item failed: %s\n"
+msgstr "allocating list item failed: %s\n"
+
+#: dirmngr/ocsp.c:481
+#, c-format
+msgid "error getting responder ID: %s\n"
+msgstr "error getting responder ID: %s\n"
+
+#: dirmngr/ocsp.c:516
+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:555 dirmngr/validate.c:648
+#, c-format
+msgid "issuer certificate not found: %s\n"
+msgstr "issuer certificate not found: %s\n"
+
+#: dirmngr/ocsp.c:565
+msgid "caller did not return the target certificate\n"
+msgstr "caller did not return the target certificate\n"
+
+#: dirmngr/ocsp.c:572
+msgid "caller did not return the issuing certificate\n"
+msgstr "caller did not return the issuing certificate\n"
+
+#: dirmngr/ocsp.c:582
+#, c-format
+msgid "failed to allocate OCSP context: %s\n"
+msgstr "failed to allocate OCSP context: %s\n"
+
+#: dirmngr/ocsp.c:616
+#, c-format
+msgid "can't get authorityInfoAccess: %s\n"
+msgstr "can't get authorityInfoAccess: %s\n"
+
+#: dirmngr/ocsp.c:623
+msgid "no default OCSP responder defined\n"
+msgstr "no default OCSP responder defined\n"
+
+#: dirmngr/ocsp.c:629
+msgid "no default OCSP signer defined\n"
+msgstr "no default OCSP signer defined\n"
+
+#: dirmngr/ocsp.c:636
+#, c-format
+msgid "using default OCSP responder '%s'\n"
+msgstr "using default OCSP responder ‘%s’\n"
+
+#: dirmngr/ocsp.c:641
+#, c-format
+msgid "using OCSP responder '%s'\n"
+msgstr "using OCSP responder ‘%s’\n"
+
+#: dirmngr/ocsp.c:648
+#, 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:678
+#, 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:703
+#, 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:704
+msgid "good"
+msgstr "good"
+
+#: dirmngr/ocsp.c:710
+#, 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:745
+msgid "OCSP responder returned a status in the future\n"
+msgstr "OCSP responder returned a status in the future\n"
+
+#: dirmngr/ocsp.c:757
+msgid "OCSP responder returned a non-current status\n"
+msgstr "OCSP responder returned a non-current status\n"
+
+#: dirmngr/ocsp.c:772
+msgid "OCSP responder returned an too old status\n"
+msgstr "OCSP responder returned an too old status\n"
+
+#: 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:985
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
+#: dirmngr/server.c:1059
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
+#: 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:1324
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
+#: 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:1474
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
+#: dirmngr/server.c:1507
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
+#: dirmngr/server.c:1534
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
+#: 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:2591
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
+#: 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: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:2651
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
+#: dirmngr/server.c:2670
+#, c-format
+msgid "Assuan processing failed: %s\n"
+msgstr "Assuan processing failed: %s\n"
+
+#: 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:264
+msgid "CRL checking too deeply nested\n"
+msgstr "CRL checking too deeply nested\n"
+
+#: dirmngr/validate.c:282
+msgid "not checking CRL for"
+msgstr "not checking CRL for"
+
+#: dirmngr/validate.c:287
+msgid "checking CRL for"
+msgstr "checking CRL for"
+
+#: dirmngr/validate.c:556
+msgid "selfsigned certificate has a BAD signature"
+msgstr "selfsigned certificate has a BAD signature"
+
+#: 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:769
+msgid "certificate chain is good\n"
+msgstr "certificate chain is good\n"
+
+#: 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:179
+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:480 tools/gpgconf-comp.c:612 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:776 tools/gpgconf-comp.c:875
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:789 tools/gpgconf-comp.c:898
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:512 tools/gpgconf-comp.c:654 tools/gpgconf-comp.c:731
+#: tools/gpgconf-comp.c:818 tools/gpgconf-comp.c:911
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:664 tools/gpgconf-comp.c:831
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:540
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:564
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
+#: tools/gpgconf-comp.c:571
+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:575
+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:579
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:583
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:587
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:591
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:702 tools/gpgconf-comp.c:791
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:794
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:708
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:744 tools/gpgconf-comp.c:950
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:746 tools/gpgconf-comp.c:952
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:749
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:752
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:803
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:806
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:839
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:888
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:930
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:943
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:957
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:968
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:973
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:1002
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:1010
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1091
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: tools/gpgconf-comp.c:1092
+msgid "Private Keys"
+msgstr "Private Keys"
+
+#: tools/gpgconf-comp.c:1093
+msgid "Smartcards"
+msgstr "Smartcards"
+
+#: tools/gpgconf-comp.c:1094
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:1095
+msgid "Network"
+msgstr "Network"
+
+#: tools/gpgconf-comp.c:1096
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1287
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3410
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3561
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf-comp.c:4135
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘%s’\n"
+
+#: tools/gpgconf-comp.c:4137
+#, 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:554 tools/gpgconf.c:589
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
+#: tools/gpgconf.c:563 tools/gpgconf.c:613 tools/gpgconf.c:646
+msgid "Component not found"
+msgstr "Component not found"
+
+#: tools/gpgconf.c:672
+msgid "No argument allowed"
+msgstr "No argument allowed"
+
+#: tools/symcryptrun.c:166
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@\n"
+"Commands:\n"
+" "
+
+#: tools/symcryptrun.c:168
+msgid "decryption modus"
+msgstr "decryption modus"
+
+#: tools/symcryptrun.c:169
+msgid "encryption modus"
+msgstr "encryption modus"
+
+#: tools/symcryptrun.c:173
+msgid "tool class (confucius)"
+msgstr "tool class (confucius)"
+
+#: tools/symcryptrun.c:174
+msgid "program filename"
+msgstr "program filename"
+
+#: tools/symcryptrun.c:176
+msgid "secret key file (required)"
+msgstr "secret key file (required)"
+
+#: tools/symcryptrun.c:177
+msgid "input file name (default stdin)"
+msgstr "input file name (default stdin)"
+
+#: tools/symcryptrun.c:221
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Usage: symcryptrun [options] (-h for help)"
+
+#: tools/symcryptrun.c:224
+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:290
+#, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s on %s aborted with status %i\n"
+
+#: tools/symcryptrun.c:297
+#, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s on %s failed with status %i\n"
+
+#: tools/symcryptrun.c:329
+#, c-format
+msgid "can't create temporary directory '%s': %s\n"
+msgstr "can't create temporary directory '%s': %s\n"
+
+#: tools/symcryptrun.c:369 tools/symcryptrun.c:386
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "could not open %s for writing: %s\n"
+
+#: tools/symcryptrun.c:397
+#, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error writing to %s: %s\n"
+
+#: tools/symcryptrun.c:404
+#, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error reading from %s: %s\n"
+
+#: tools/symcryptrun.c:411 tools/symcryptrun.c:418
+#, c-format
+msgid "error closing %s: %s\n"
+msgstr "error closing %s: %s\n"
+
+#: tools/symcryptrun.c:502
+msgid "no --program option provided\n"
+msgstr "no --program option provided\n"
+
+#: tools/symcryptrun.c:508
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr "only --decrypt and --encrypt are supported\n"
+
+#: tools/symcryptrun.c:514
+msgid "no --keyfile option provided\n"
+msgstr "no --keyfile option provided\n"
+
+#: tools/symcryptrun.c:525
+msgid "cannot allocate args vector\n"
+msgstr "cannot allocate args vector\n"
+
+#: tools/symcryptrun.c:543
+#, c-format
+msgid "could not create pipe: %s\n"
+msgstr "could not create pipe: %s\n"
+
+#: tools/symcryptrun.c:550
+#, c-format
+msgid "could not create pty: %s\n"
+msgstr "could not create pty: %s\n"
+
+#: tools/symcryptrun.c:566
+#, c-format
+msgid "could not fork: %s\n"
+msgstr "could not fork: %s\n"
+
+#: tools/symcryptrun.c:594
+#, c-format
+msgid "execv failed: %s\n"
+msgstr "execv failed: %s\n"
+
+#: tools/symcryptrun.c:623
+#, c-format
+msgid "select failed: %s\n"
+msgstr "select failed: %s\n"
+
+#: tools/symcryptrun.c:640
+#, c-format
+msgid "read failed: %s\n"
+msgstr "read failed: %s\n"
+
+#: tools/symcryptrun.c:692
+#, c-format
+msgid "pty read failed: %s\n"
+msgstr "pty read failed: %s\n"
+
+#: tools/symcryptrun.c:744
+#, c-format
+msgid "waitpid failed: %s\n"
+msgstr "waitpid failed: %s\n"
+
+#: tools/symcryptrun.c:758
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr "child aborted with status %i\n"
+
+#: tools/symcryptrun.c:813
+#, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "cannot allocate infile string: %s\n"
+
+#: tools/symcryptrun.c:826
+#, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "cannot allocate outfile string: %s\n"
+
+#: tools/symcryptrun.c:999
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1021
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1030
+#, 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 03cf53c,8ee1d6b..66c4d16
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -107,8 -89,6 +107,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "malbona pasfrazo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -153,95 -125,66 +153,95 @@@ msgstr "malbona MPI
msgid "Bad Passphrase"
msgstr "malbona pasfrazo"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@@ -408,10 -320,6 +408,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Ŝlosilo estas anstataŭigita."
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detala eligo"
@@@ -520,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -540,36 -416,25 +540,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@@ -615,14 -471,10 +615,14 @@@ msgstr "aktualigo malsukcesis: %s\n
msgid "listening on socket '%s'\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
msgid "can't create directory '%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: dosierujo kreita\n"
@@@ -662,18 -507,14 +662,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu ŝlosiloj ignoritaj\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@@ -689,8 -528,6 +689,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -535,6 +698,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -814,8 -629,6 +814,8 @@@ msgstr "
msgid "Yes"
msgstr "jes"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -866,19 -672,16 +866,19 @@@ msgstr "ŝanĝi la pasfrazon
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "ŝalti ŝlosilon"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1744,8 -1360,6 +1744,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
@@@ -2041,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de ŝlosilbloko: %s\n"
@@@ -2284,8 -1781,6 +2284,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2310,8 -1801,6 +2310,8 @@@ msgstr "ŝlosilo %08lX: PGP-2.x-stila �
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2322,8 -1810,6 +2322,8 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "nevalida kiraso"
@@@ -2359,256 -1839,200 +2359,256 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "No fingerprint"
msgstr "Fingrospuro:"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Nevalida ŝlosilo %08lX validigita per --always-trust\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "uzas flankan ŝlosilon %08lX anstataŭ la ĉefa ŝlosilo %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "ĉifri datenojn"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "ĉifri nur kun simetria ĉifro"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "malĉifri datenojn (implicita elekto)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "listigi ŝlosilojn"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "listigi ŝlosilojn kaj subskribojn"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli ŝlosilsubskribojn"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "listigi sekretajn ŝlosilojn"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "krei novan ŝlosilparon"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "subskribi ŝlosilon"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "subskribi ŝlosilon loke"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "subskribi ŝlosilon"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "subskribi ŝlosilon loke"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "subskribi aŭ redakti ŝlosilon"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "eksporti ŝlosilojn"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "eksporti ŝlosilojn al ŝlosilservilo"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importi ŝlosilojn de ŝlosilservilo"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importi/kunfandi ŝlosilojn"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|ĉifri por NOMO"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "uzi tekstan reĝimon"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "fari neniajn ŝanĝojn"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr ""
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2616,7 -2040,6 +2616,7 @@@ msgstr "
"@\n"
"(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2646,13 -2069,11 +2646,13 @@@ msgstr "
" --list-keys [nomoj] montri ŝlosilojn\n"
" --fingerprint [nomoj] montri fingroŝpurojn\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2667,7 -2088,6 +2667,7 @@@ msgstr "
"subskribi, kontroli, ĉifri aŭ malĉifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2675,553 -2095,437 +2675,553 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Nevalida retadreso\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida ŝlosilaro"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita ĉifrad-metodo ne validas\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita ĉifrad-metodo ne validas\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
#, 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:3746
++#: g10/gpg.c:3749
#, 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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "malĉifrado malsukcesis: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesaĝon ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3786,8 -2979,6 +3786,8 @@@ msgstr "[revoko]
msgid "[self-signature]"
msgstr "[mem-subskribo]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
@@@ -4617,15 -3648,10 +4617,15 @@@ msgid "
"unless you restart the program.\n"
msgstr ""
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "rev"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "eksval"
@@@ -5594,19 -4441,16 +5594,19 @@@ msgstr " Ŝlosilo-fingrospuro =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolas ŝlosilaron '%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5614,7 -4458,6 +5614,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu ŝlosiloj aktualigitaj\n"
msgstr[1] "\t%lu ŝlosiloj aktualigitaj\n"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5622,7 -4465,6 +5622,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 malbona subskribo\n"
msgstr[1] "1 malbona subskribo\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ŝlosilaro kreita\n"
@@@ -5716,7 -4539,6 +5716,7 @@@ msgstr "petas la ŝlosilon %08lX de HKP
msgid "no keyserver known\n"
msgstr "nevalida ŝlosilaro"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignoris '%s': %s\n"
@@@ -6019,122 -4780,90 +6019,112 @@@ msgstr "kiraso: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
#, fuzzy
msgid "Uncompressed"
msgstr "ne traktita"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "ne traktita"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, fuzzy, c-format
msgid "this message may not be usable by %s\n"
msgstr "ĉi tiu mesaĝo povas ne esti uzebla de PGP 2.x\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Dosiero '%s' ekzistas. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Ĉu surskribi (j/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: nekonata sufikso\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Donu novan dosiernomon"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "skribas al la normala eligo\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "supozas subskribitajn datenojn en '%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "%s: nova opcio-dosiero kreita\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publikŝlosilan metodon %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas ŝaltitan \"critical bit\"\n"
@@@ -6935,22 -5515,18 +6925,22 @@@ msgstr "subskribas:
msgid "%s encryption will be used\n"
msgstr "%s ĉifrado estos aplikata\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ŝlosilo ne estas markita kiel malsekura - ne povas uzi ĝin kun falsa "
"stokastilo!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignoris '%s': ripetita\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7037,7 -5597,6 +7027,7 @@@ msgstr "fido-datenaro-transakcio tro gr
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
@@@ -7179,10 -5710,6 +7169,10 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7214,7 -5736,6 +7204,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7243,126 -5760,103 +7233,122 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Gvidlinio: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listigi ŝlosilojn"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "Ripetu pasfrazon\n"
msgstr[1] "Ripetu pasfrazon\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
@@@ -7370,148 -5864,122 +7356,148 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Forviŝis %d subskribojn.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "Ripetu pasfrazon\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Gvidlinio: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7528,18 -5996,14 +7514,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9721,8 -7740,6 +9707,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/es.po
index 3a57eac,abc9b79..3bfe673
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -125,8 -107,6 +125,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Frase contraseña:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "no coincide - reinténtelo"
@@@ -175,48 -147,28 +175,48 @@@ msgstr "PIN incorrecto
msgid "Bad Passphrase"
msgstr "Frase contraseña errónea"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de más de %d bits\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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"
@@@ -224,43 -176,35 +224,43 @@@ msgstr "
"error obteniendo ID de la clave por defecto para autenticaren la tarjeta: "
"%s\n"
- #: agent/command-ssh.c:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Por favor vuelva a introducir frase contraseña"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, fuzzy, c-format
#| msgid ""
#| "Please enter a passphrase to protect the received secret key%%0A %s"
@@@ -272,7 -216,6 +272,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
@@@ -455,10 -367,6 +455,10 @@@ msgstr "ejecutar en modo servidor (prim
msgid "run in supervised mode"
msgstr "ejecutar en modo servidor"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolijo"
@@@ -566,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
@@@ -592,37 -468,26 +592,37 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, 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:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -671,15 -527,11 +671,15 @@@ msgstr "listen() falló: %s\n
msgid "listening on socket '%s'\n"
msgstr "escuchando el socket `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "no se puede crear el directorio `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -722,20 -567,16 +722,20 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
@@@ -755,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -764,9 -601,6 +764,9 @@@ msgstr "
"@Órdenes:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -888,8 -703,6 +888,8 @@@ msgstr "
msgid "Yes"
msgstr "Sí"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -944,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:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -952,13 -757,11 +952,13 @@@
"%%0A?"
msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "habilita clave"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1795,8 -1411,6 +1795,8 @@@ msgstr "Error: URL demasiado larga (el
msgid "error reading '%s': %s\n"
msgstr "error leyendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -2094,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
@@@ -2346,8 -1843,6 +2346,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2371,8 -1862,6 +2371,8 @@@ msgstr "clave %s: clave estilo PGP 2.x
msgid "WARNING: nothing exported\n"
msgstr "ATENCIÓN: no se ha exportado nada\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2382,8 -1870,6 +2382,8 @@@ msgstr "error creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2422,243 -1902,188 +2422,243 @@@ msgstr "error recuperando `%s' vía %s
msgid "No fingerprint"
msgstr "No hay huella dactilar"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando subclave %s en vez de clave primaria %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "crea una firma"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "cifra datos"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "cifra sólo con un cifrado simétrico"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "lista claves"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "lista claves y firmas"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocación"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo público"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "cambia una frase contraseña"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exporta claves"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exporta claves a un servidor de claves"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "busca claves en un servidor de claves"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importa/fusiona claves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "imprime resúmenes de mensaje"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresión N (0 desactiva)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "usa modo de texto canónico"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "no hace ningún cambio"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
@@@ -2666,7 -2091,6 +2666,7 @@@
# página man -> página de manual
# Vale. ¿del manual mejor?
# Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2674,7 -2098,6 +2674,7 @@@ msgstr "
"@\n"
"(Véase en la página del manual la lista completo de órdenes y opciones)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2704,13 -2127,11 +2704,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2725,7 -2146,6 +2725,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operación por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2733,81 -2153,66 +2733,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Clave pública: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compresión: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "órdenes incompatibles\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no se encontró el signo = en la definición de grupo `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedad insegura del fichero de configuración `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedad insegura de la extensión `%s'\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros del fichero de configuración `%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros de la extensión `%s'\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2817,20 -2222,17 +2817,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"AVISO: propiedad insegura del directorio contenedor de la extensión `%s'\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2841,445 -2243,351 +2841,445 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"AVISO: permisos inseguros del directorio contenedor de la extensión `%s'\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "artículo de configuración desconocido `%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de política al listar firmas"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones estándar IETF al listar firmas"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opción desconocida `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importación inválidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opciones de importación inválidas\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "lista de opciones inválida\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportación inválidas\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opciones de exportación inválidas\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inválida\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "lista de opciones inválida\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de política al verificar firmas"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones estándar IETF al verificar firmas"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos válidos PKA"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificación inválidas\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "opciones de verificación inválidas\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, 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:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localización de claves inválida\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "¡%s no permitido con %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "¡%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecutándose con hora del sistema falsificada"
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inválido\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresión seleccionado es inválido\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inválidas\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inválidas\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inválidas\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresión inválidas\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s aún no funciona con %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, 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:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "envío al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepción del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "exportación de clave fallida: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "búsqueda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovación al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminación de armadura fallida: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creación de armadura fallida: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
@@@ -3287,19 -2595,15 +3287,19 @@@
# En español no se deja espacio antes de los puntos suspensivos
# (Real Academia dixit) :)
# Tomo nota :-). Este comentario déjalo siempre.
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "URL de política de certificado inválida\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "URL de política inválida\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es válida\n"
@@@ -3878,8 -3071,6 +3878,8 @@@ msgstr "[revocación]
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@@ -4663,14 -3694,9 +4663,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "revocada"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "caducada"
@@@ -5625,13 -4472,11 +5625,13 @@@ msgstr " Huella de clave =
msgid " Card serial no. ="
msgstr " Número de serie de la tarjeta ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "memorizando anillo `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5639,7 -4484,6 +5639,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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5647,7 -4491,6 +5647,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu claves actualizadas\n"
msgstr[1] "\t%lu claves actualizadas\n"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5655,7 -4498,6 +5655,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 firma incorrecta\n"
msgstr[1] "1 firma incorrecta\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
@@@ -5748,7 -4571,6 +5748,7 @@@ msgstr "solicitando clave %s de %s\n
msgid "no keyserver known\n"
msgstr "¡no se solicita ninguna acción al servidor de claves!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omitido \"%s\": %s\n"
@@@ -6049,129 -4810,95 +6049,117 @@@ msgstr "error de lectura `%s': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opción obsoleta \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor use \"%s%s\" en su lugar\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ATENCIÓN: \"%s\" es una orden obsoleta - no la use\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: opción obsoleta \"%s\" - no tiene efecto\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Sin comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "sin_comprimir|ninguno"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "este mensaje podría no ser utilizable por %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opción ambigua `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opción desconocida `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA necesita un resumen cuya longitud sea múltiplo de 8 bits\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Clase de firma desconocida `%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "El fichero `%s' ya existe. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "¿Sobreescribir? (s/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufijo desconocido\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Introduzca nuevo nombre de fichero"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "escribiendo en stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "asumiendo que hay datos firmados en `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "creado un nuevo fichero de configuración `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: las opciones en `%s' no están aún activas en esta ejecución\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave pública %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: clave de sesión cifrada simétricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
@@@ -7000,20 -5578,16 +6988,20 @@@ msgstr "firmando:
msgid "%s encryption will be used\n"
msgstr "se usará un cifrado %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" omitido: duplicado\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
@@@ -7103,7 -5661,6 +7091,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:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7247,10 -5776,6 +7235,10 @@@ msgstr "error creando fichero temporal
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7285,7 -5805,6 +7273,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7315,53 -5830,41 +7303,49 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista clave e identificadores de usuario"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "error obteniendo parámetros almacenados: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista claves"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7369,14 -5872,12 +7353,14 @@@ msgid_plural "Verified %d messages.
msgstr[0] "imprime resúmenes de mensaje"
msgstr[1] "imprime resúmenes de mensaje"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7384,61 -5885,52 +7368,61 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "imprime resúmenes de mensaje"
msgstr[1] "imprime resúmenes de mensaje"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "el algoritmo de resumen seleccionado no es válido\n"
@@@ -7446,90 -5938,75 +7430,90 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "error escribiendo clave: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, fuzzy, c-format
#| msgid "second"
msgid "%lld~second"
@@@ -7537,18 -6014,15 +7521,18 @@@ msgid_plural "%lld~seconds
msgstr[0] "segundo"
msgstr[1] "segundo"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d firmas borradas\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7556,43 -6030,35 +7540,43 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "imprime resúmenes de mensaje"
msgstr[1] "imprime resúmenes de mensaje"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "el algoritmo de resumen seleccionado no es válido\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7609,19 -6075,15 +7593,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9905,8 -7922,6 +9889,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/et.po
index c563f9f,355d45c..e508b0c
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -104,8 -86,6 +104,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "halb parool"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -150,95 -122,66 +150,95 @@@ msgstr "halb MPI
msgid "Bad Passphrase"
msgstr "halb parool"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuda parooli"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
@@@ -404,10 -316,6 +404,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Võti on asendatud"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "ole jutukas"
@@@ -516,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -536,36 -412,25 +536,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -612,15 -468,11 +612,15 @@@ msgstr "uuendamine ebaõnnestus: %s\n
msgid "listening on socket '%s'\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: kataloog on loodud\n"
@@@ -660,18 -505,14 +660,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jätsin vahele: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -687,8 -526,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -533,6 +696,9 @@@ msgstr "
"@Käsud:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -812,8 -627,6 +812,8 @@@ msgstr "
msgid "Yes"
msgstr "jah"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -670,16 +864,19 @@@ msgstr "muuda parooli
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "luba võti"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1737,8 -1353,6 +1737,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -2034,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga võtmebloki lugemisel: %s\n"
@@@ -2289,8 -1786,6 +2289,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: jätsin vahele: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2315,8 -1806,6 +2315,8 @@@ msgstr "võti %08lX: PGP 2.x stiilis v�
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2327,8 -1815,6 +2327,8 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "vigased impordi võtmed\n"
@@@ -2364,258 -1844,202 +2364,258 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "No fingerprint"
msgstr "näita sõrmejälge"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salajast võtit `%s' ei leitud: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
"kasutamisega\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "krüpteeri andmed"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dekrüpteeri andmed (vaikimisi)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "näita võtmeid"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "näita võtmeid ja allkirju"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli võtmete allkirju"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "näita võtmeid ja sõrmejälgi"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "näita salajasi võtmeid"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genereeri uus võtmepaar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "genereeri tühistamise sertifikaat"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "eemalda võtmed avalike võtmete hoidlast"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "eemalda võtmed salajaste võtmete hoidlast"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allkirjasta võti"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allkirjasta võti lokaalselt"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "allkirjasta võti"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "allkirjasta võti lokaalselt"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "allkirjasta või toimeta võtit"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "ekspordi võtmed"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "ekspordi võtmed võtmeserverisse"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "impordi võtmed võtmeserverist"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "otsi võtmeid võtmeserverist"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "uuenda võtmeid võtmeserverist"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "impordi/mesti võtmed"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [failid]|trüki teatelühendid"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "loo ascii pakendis väljund"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|krüpti NIMEle"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|määra pakkimise tase N (0 blokeerib)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ära tee mingeid muutusi"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "küsi enne ülekirjutamist"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2623,7 -2047,6 +2623,7 @@@ msgstr "
"@\n"
"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2653,13 -2076,11 +2653,13 @@@ msgstr "
" --list-keys [nimed] näita võtmeid\n"
" --fingerprint [nimed] näita sõrmejälgi\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2674,7 -2095,6 +2674,7 @@@ msgstr "
"allkirjasta, kontrolli, krüpti ja dekrüpti\n"
"vaikimisi operatsioon sõltub sisendandmetest\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2682,546 -2102,430 +2682,546 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Avalik võti: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Šiffer: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Räsi: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [võtmed] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "vastuolulised käsud\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi võtmed\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi võtmed\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi võtmed\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi võtmed\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s määrab üle %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos mõtet!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud šifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud šifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku šifri eelistused\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku lühendi eelistused\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei tööta veel koos %s-ga\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "võtme eksport ebaõnnestus: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage nüüd oma teade ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3790,8 -2983,6 +3790,8 @@@ msgstr "[tühistamine]
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@@ -4605,15 -3636,10 +4605,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[tühistatud] "
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5570,26 -4417,22 +5570,26 @@@ msgstr " Võtme sõrmejälg =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrollin võtmehoidlat `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5597,7 -4440,6 +5597,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 halb allkiri\n"
msgstr[1] "1 halb allkiri\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: võtmehoidla on loodud\n"
@@@ -5691,7 -4514,6 +5691,7 @@@ msgstr "küsin võtit %08lX võtmeserve
msgid "no keyserver known\n"
msgstr "vigased ekspordi võtmed\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "`%s' jätsin vahele: %s\n"
@@@ -5993,125 -4754,91 +5993,113 @@@ msgstr "viga lugemisel: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Pakkimata"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "loen võtmeid failist `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Fail `%s' on olemas. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Kirjutan üle (j/E)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: tundmatu suffiks\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Sisestage uus failinimi"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "kirjutan standardväljundisse\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "uus omaduste fail `%s' on loodud\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
"võti\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
@@@ -6910,21 -5488,17 +6898,21 @@@ msgstr "allkirjastan:
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s krüpteerimist\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "`%s' jätsin vahele: duplikaat\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7013,7 -5571,6 +7001,7 @@@ msgstr "trustdb transaktsioon on liiga
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "`%s' ei õnnestu sulgeda: %s\n"
@@@ -7156,10 -5685,6 +7144,10 @@@ msgstr "viga parooli loomisel: %s\n
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7191,7 -5711,6 +7179,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7220,58 -5735,45 +7208,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "näita võtit ja kasutaja IDd"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Poliis: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näita võtmeid"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [failid]|trüki teatelühendid"
msgstr[1] "|algo [failid]|trüki teatelühendid"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7279,68 -5781,58 +7263,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "krüpteeritud kasutades %lu parooli\n"
msgstr[1] "krüpteeritud kasutades %lu parooli\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [failid]|trüki teatelühendid"
msgstr[1] "|algo [failid]|trüki teatelühendid"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [failid]|trüki teatelühendid"
msgstr[1] "|algo [failid]|trüki teatelühendid"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [failid]|trüki teatelühendid"
@@@ -7348,149 -5840,123 +7332,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Kustutatud %d allkirja.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krüpteeritud kasutades %lu parooli\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Poliis: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7507,18 -5973,14 +7491,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9693,8 -7710,6 +9677,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/fi.po
index 6071429,ba6c056..cf83f8e
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -120,8 -102,6 +120,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "väärä salasana"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -166,95 -138,66 +166,95 @@@ msgstr "MPI ei kelpaa
msgid "Bad Passphrase"
msgstr "väärä salasana"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muuta salasanaa"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@@ -420,10 -332,6 +420,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Avain on uusittu"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "monisanainen"
@@@ -532,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -553,36 -429,25 +553,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -629,15 -485,11 +629,15 @@@ msgstr "päivitys epäonnistui: %s\n
msgid "listening on socket '%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: hakemisto luotu\n"
@@@ -677,18 -522,14 +677,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -704,8 -543,6 +704,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -713,9 -550,6 +713,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -829,8 -644,6 +829,8 @@@ msgstr "
msgid "Yes"
msgstr "kyllä|kylla|joo"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -881,19 -687,16 +881,19 @@@ msgstr "muuta salasanaa
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "ota avain käyttöön"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1756,8 -1372,6 +1756,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -2053,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -2304,8 -1801,6 +2304,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2330,8 -1821,6 +2330,8 @@@ msgstr "avain %08lX: PGP 2.x -muodon av
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2342,8 -1830,6 +2342,8 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "virheelliset tuontivalitsimet\n"
@@@ -2379,258 -1859,202 +2379,258 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "No fingerprint"
msgstr "näytä sormenjälki"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr ""
"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "salaa tiedot"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "näytä avaimet"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "vie avaimia"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "vie avaimia palvelimelle"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "nouda avaimia avainpalvelimelta"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "etsi avaimia avainpalvelimelta"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "älä tee muutoksia"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2639,7 -2063,6 +2639,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2668,13 -2091,11 +2668,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2689,7 -2110,6 +2689,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2697,547 -2117,431 +2697,547 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3809,8 -3002,6 +3809,8 @@@ msgstr "[mitätöinti]
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@@ -4626,15 -3657,10 +4626,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5601,26 -4448,22 +5601,26 @@@ msgstr " Avaimen sormenjälki =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "tarkistetaan avainrengasta \"%s\"\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5628,7 -4471,6 +5628,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 väärä allekirjoitus\n"
msgstr[1] "1 väärä allekirjoitus\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
@@@ -5722,7 -4545,6 +5722,7 @@@ msgstr "pyydetään avainta %08lX kohte
msgid "no keyserver known\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ohitetaan \"%s\": %s\n"
@@@ -6032,125 -4793,89 +6032,111 @@@ msgstr "lukuvirhe: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "pakkaamaton"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "pakkaamaton"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Tiedosto \"%s\" on olemassa."
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: tuntematon pääte\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Syötä uusi tiedostonimi"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "kirjoitetaan vakiotulosteeseen\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "uusi asetustiedosto \"%s\" luotu\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
- "ajossa\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@@ -6968,22 -5544,18 +6954,22 @@@ msgstr "allekirjoitetaan:
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
"satunnaislukugeneraattorin kanssa!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ohitetaan \"%s\": kopio\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7072,7 -5628,6 +7058,7 @@@ msgstr "trustdb-tapahtuma on liian suur
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -7215,10 -5742,6 +7201,10 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7250,7 -5768,6 +7236,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7279,58 -5792,45 +7265,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "näytä avaimet ja käyttäjätunnukset"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Käytäntö: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näytä avaimet"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7338,68 -5838,58 +7320,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "salattu %lu salasanalla\n"
msgstr[1] "salattu %lu salasanalla\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
@@@ -7407,149 -5897,123 +7389,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d allekirjoitusta poistettu.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "salattu %lu salasanalla\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Käytäntö: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7566,18 -6030,14 +7548,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9756,8 -7771,6 +9738,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/fr.po
index 6a5d8a4,77e03b7..11e53ce
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -119,8 -101,6 +119,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Phrase secrète :"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "ne correspond pas — veuillez réessayer"
@@@ -160,62 -132,39 +160,62 @@@ msgstr "Mauvais code personnel
msgid "Bad Passphrase"
msgstr "Mauvaise phrase secrète"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -224,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Autoriser"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Refuser"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Veuillez répéter cette phrase secrète"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -250,7 -194,6 +250,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "échec de création du flux à partir de cette socket : %s\n"
@@@ -415,10 -327,6 +415,10 @@@ msgstr "exécuter en mode serveur (prem
msgid "run in supervised mode"
msgstr "exécuter en mode serveur"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "bavard"
@@@ -521,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
@@@ -543,33 -419,22 +543,33 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "niveau de débogage « %s » incorrect\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
@@@ -616,14 -472,10 +616,14 @@@ msgstr "échec de listen() : %s\n
msgid "listening on socket '%s'\n"
msgstr "écoute sur la socket « %s »\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "impossible de créer le répertoire « %s » : %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "répertoire « %s » créé\n"
@@@ -663,18 -508,14 +663,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr ""
"aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
@@@ -692,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -538,6 +701,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -820,8 -635,6 +820,8 @@@ msgstr "
msgid "Yes"
msgstr "Oui"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Non"
@@@ -877,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:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -885,11 -690,9 +885,11 @@@
"%%0A?"
msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Supprimer la clef"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1706,8 -1322,6 +1706,8 @@@ msgstr "Erreur : URL trop longue (limi
msgid "error reading '%s': %s\n"
msgstr "erreur de lecture de « %s » : %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
@@@ -1999,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clef « %s » introuvable : %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
@@@ -2244,8 -1741,6 +2244,8 @@@ msgstr "
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
@@@ -2268,8 -1759,6 +2268,8 @@@ msgstr "clef %s : clef de type PGP 2.
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2278,8 -1766,6 +2278,8 @@@
msgid "[User ID not found]"
msgstr "[identité introuvable]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2316,246 -1796,190 +2316,246 @@@ msgstr "erreur de récupération de «�
msgid "No fingerprint"
msgstr "Aucune empreinte"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clef secrète « %s » introuvable : %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"La clef incorrecte %s a été rendue valable par\n"
"--allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr ""
"utilisation de la sous-clef %s à la place de la clef\n"
"principale %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "faire une signature"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "chiffrer les données"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "afficher les clefs"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "afficher les clefs et les signatures"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "générer une paire de clefs complètes"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "signer rapidement une clef"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "signer rapidement une clef localement"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "signer une clef"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "signer une clef localement"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exporter les clefs"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exporter les clefs vers un serveur de clefs"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importer les clefs d'un serveur de clefs"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "chercher les clefs avec un serveur de clefs"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "mettre à jour les clefs depuis un serveur"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importer ou fusionner les clefs"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "afficher l'état de la carte"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "modifier les données d'une carte"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "modifier le code personnel d'une carte"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "mettre la base de confiance à jour"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "exécuter en mode serveur"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "créer une sortie ASCII avec armure"
# NOTE: Extra initial space to realign the output (maybe wchar issue)
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ne rien modifier"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "demander avant d'écraser un fichier"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2564,7 -1988,6 +2564,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2594,11 -2017,9 +2594,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2608,7 -2029,6 +2608,7 @@@ msgstr "
"Signer, vérifier, chiffrer ou déchiffrer\n"
"L'opération par défaut dépend des données entrées\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2616,86 -2036,71 +2616,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire personnel « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"Attention : le propriétaire du fichier de configuration « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr ""
"Attention : le propriétaire de l'extension « %s »\n"
" n'est pas sûr\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"Attention : les droits du répertoire personnel « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"Attention : les droits du fichier de configuration « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr ""
"Attention : les droits de l'extension « %s »\n"
" ne sont pas sûrs\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
" « %s » n'est pas sûr\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2703,21 -2108,18 +2703,21 @@@ msgstr "
"Attention : le propriétaire du répertoire contenant le fichier de\n"
" configuration « %s » n'est pas sûr\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Attention : le propriétaire du répertoire contenant l'extension\n"
" « %s » n'est pas sûr\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Attention : les droits du répertoire contenant le répertoire personnel\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2725,453 -2127,355 +2725,453 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Attention : les droits du répertoire contenant l'extension\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
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:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
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:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
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:3248
++#: g10/gpg.c:3251
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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
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:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, 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:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
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"
@@@ -3740,8 -2933,6 +3740,8 @@@ msgstr "[révocation]
msgid "[self-signature]"
msgstr "[autosignature]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "erreur d'allocation de mémoire : %s\n"
@@@ -4517,14 -3548,9 +4517,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "révoquée"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "expirée"
@@@ -5483,12 -4330,10 +5483,12 @@@ msgstr " Empreinte de la clef =
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "mise en cache du porte-clefs « %s »\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5496,7 -4341,6 +5496,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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5504,7 -4348,6 +5504,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "vider le cache"
msgstr[1] "vider le cache"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5512,7 -4355,6 +5512,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 mauvaise signature\n"
msgstr[1] "1 mauvaise signature\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s : porte-clefs créé\n"
@@@ -5609,7 -4432,6 +5609,7 @@@ msgstr "requête de la clef %s sur %s\n
msgid "no keyserver known\n"
msgstr "pas d'action pour le serveur de clefs.\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "« %s » a été ignorée : %s\n"
@@@ -5911,34 -4672,28 +5911,34 @@@ msgstr "erreur de lecture dans « %s
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s : %d : option « %s » déconseillée\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Attention : « %s » est une option déconseillée\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "veuillez plutôt utiliser « %s%s »\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "Attention : « %s » est une commande déconseillée — ne l'utilisez pas\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s : %u : « %s » est obsolète dans ce fichier — n’est prise en compte que "
"dans %s\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5946,92 -4701,65 +5946,81 @@@ msgstr "
"Attention : « %s%s » est une option obsolète — non prise en compte à part "
"dans %s\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Non compressé"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "non compressé|non|sans"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ce message ne sera pas utilisable par %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "option « %s » ambiguë\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"une clef publique ECDSA est censée être dans un encodage SEC multiple de "
"8 bits\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Type de signature « %s » inconnu\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Le fichier « %s » existe. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Faut-il réécrire par-dessus ? (o/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s : suffixe inconnu\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Entrez le nouveau nom de fichier"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "écriture vers la sortie standard\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "les données signées sont supposées être dans « %s »\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "nouveau fichier de configuration « %s » créé\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "Attention : les options de « %s » ne sont pas encore actives cette fois\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossible de gérer l'algorithme à clef publique %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"Attention : la clef de session chiffrée de manière symétrique risque\n"
" de ne pas être sécurisée\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possède un bit critique\n"
@@@ -6895,22 -5474,18 +6884,22 @@@ msgstr "signature :
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la clef n'est pas marquée comme non sécurisée — elle ne peut pas être\n"
"utilisée avec le soi-disant générateur de nombres aléatoires.\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "« %s » a été ignorée : en double\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "ignoré : clef secrète déjà présente\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
@@@ -6996,7 -5555,6 +6985,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:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -7137,10 -5667,6 +7126,10 @@@ msgstr "erreur de création du fichier
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7175,7 -5696,6 +7164,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7205,53 -5721,41 +7194,49 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "afficher la clef et les identités"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validité : %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "erreur de lecture des options stockées : %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "afficher les clefs"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7259,7 -5763,6 +7244,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7267,7 -5770,6 +7252,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "chiffré avec %lu phrases secrètes\n"
msgstr[1] "chiffré avec %lu phrases secrètes\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7275,7 -5777,6 +7260,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7283,54 -5784,46 +7268,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7339,108 -5832,90 +7324,108 @@@ msgstr "indiquer les fonctions de hacha
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "erreur d'écriture la clef : %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d signatures supprimées\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7448,13 -5923,11 +7433,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "chiffré avec %lu phrases secrètes\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7462,31 -5935,25 +7447,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "validité : %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7503,19 -5970,15 +7488,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9741,8 -7759,6 +9726,8 @@@ msgstr "
"accès à la liste de révocations de certificat impossible car %s est "
"désactivé\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/gl.po
index 4ca27fe,35559b3..086a98e
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -105,8 -87,6 +105,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "contrasinal erróneo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -151,95 -123,66 +151,95 @@@ msgstr "MPI erróneo
msgid "Bad Passphrase"
msgstr "contrasinal erróneo"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de protección %d%s non está soportado\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha táboa hash: %s\n"
@@@ -406,10 -318,6 +406,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "A chave é obsoleta"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "lareto"
@@@ -518,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -540,36 -416,25 +540,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -616,15 -472,11 +616,15 @@@ msgstr "a actualización fallou: %s\n
msgid "listening on socket '%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directorio creado\n"
@@@ -664,18 -509,14 +664,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualización fallou: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@@ -691,8 -530,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -537,6 +700,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -816,8 -631,6 +816,8 @@@ msgstr "
msgid "Yes"
msgstr "si|sim"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -868,19 -674,16 +868,19 @@@ msgstr "cambia-lo contrasinal
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "habilitar unha chave"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1746,8 -1362,6 +1746,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -2043,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -2298,8 -1795,6 +2298,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2324,8 -1815,6 +2324,8 @@@ msgstr "chave %08lX: chave estilo PGP 2
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2336,8 -1824,6 +2336,8 @@@ msgstr "erro ao crear `%s': %s\n
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcións de importación non válidas\n"
@@@ -2373,257 -1853,201 +2373,257 @@@ msgstr "erro ao crear `%s': %s\n
msgid "No fingerprint"
msgstr "Pegada dactilar:"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "cifrar datos"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "cifrar só con cifrado simétrico"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "ve-la lista de chaves"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocación"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro público"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportar chaves a un servidor de chaves"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importar chaves dun servidor de chaves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "buscar chaves nun servidor de chaves"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "actualizar tódalas chaves dun servidor de chaves"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "crear saída con armadura en ascii"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "usar modo de texto canónico"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 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"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "non facer ningún cambio"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2631,7 -2055,6 +2631,7 @@@ msgstr "
"@\n"
"(Vexa a páxina man para un listado completo de comandos e opcións)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2661,13 -2084,11 +2661,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2682,7 -2103,6 +2682,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operación por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2690,548 -2110,432 +2690,548 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Pública: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compresión: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opcións] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr " creouse un novo ficheiro de configuración `%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro está unha chave listada"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, 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:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcións de importación non válidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opcións de exportación non válidas\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, 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:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "opcións de importación non válidas\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non é un xogo de caracteres válido\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, 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:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, 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:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "¡%s non se admite con %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "¡%s non ten sentido empregándoo con %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
#, 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:3746
++#: g10/gpg.c:3749
#, 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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non válidas\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non válidas\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non válidas\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresión personais non válidas\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "¡%s aínda non traballa con %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, 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:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o envío ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepción do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportación da chave fallou: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualización no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a súa mensaxe ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
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:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@@ -3811,8 -3004,6 +3811,8 @@@ msgstr "[revocación]
msgid "[self-signature]"
msgstr "[auto-sinatura]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@@ -4631,15 -3662,10 +4631,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5615,19 -4462,16 +5615,19 @@@ msgstr " Pegada dactilar =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "comprobando o chaveiro `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5635,7 -4479,6 +5635,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu chaves actualizadas\n"
msgstr[1] "\t%lu chaves actualizadas\n"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5643,7 -4486,6 +5643,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 sinatura errónea\n"
msgstr[1] "1 sinatura errónea\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
@@@ -5738,7 -4561,6 +5738,7 @@@ msgstr "solicitando a chave %08lX de %s
msgid "no keyserver known\n"
msgstr "opcións de exportación non válidas\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omítese `%s': %s\n"
@@@ -6043,124 -4804,90 +6043,112 @@@ msgstr "erro de lectura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opción a extinguir \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "empregue \"%s%s\" no seu canto\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Sen comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Sen comprimir"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensaxe pode non ser utilizable por %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lendo as opcións de `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "clase de sinatura descoñecida"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "O ficheiro `%s' xa existe. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "¿Sobrescribir? (s/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufixo descoñecido\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Introduza o novo nome de ficheiro"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "escribindo na saída estándar\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "suponse que hai datos asinados en `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr " creouse un novo ficheiro de configuración `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
@@@ -6974,22 -5552,18 +6962,22 @@@ msgstr "asinando:
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave non está marcada coma insegura - non se pode empregar co xerador de "
"números aleatorios falso\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "omítese `%s': duplicada\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "omítese: a chave secreta xa está presente\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7079,7 -5637,6 +7067,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:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
@@@ -7222,10 -5751,6 +7210,10 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -7257,7 -5777,6 +7245,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -7286,58 -5801,45 +7274,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "listar chave e IDs de usuario"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Normativa: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "ve-la lista de chaves"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7345,68 -5847,58 +7329,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "cifrado con %lu contrasinais\n"
msgstr[1] "cifrado con %lu contrasinais\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
@@@ -7414,149 -5906,123 +7398,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Borradas %d sinaturas.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifrado con %lu contrasinais\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Normativa: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7573,18 -6039,14 +7557,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9779,8 -7796,6 +9763,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/gnupg2.pot
index fb62c90,637ec29..544165e
--- 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.20\n"
-"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.21\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\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-05-15 16:15+0200\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: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
@@@ -97,153 -96,112 +97,153 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1208
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
msgid "Passphrase:"
-msgstr "密語:"
+msgstr ""
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
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:1076
#, c-format
msgid "SETERROR %s (try %d of %d)"
-msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
+msgstr ""
+#: agent/call-pinentry.c:1087
msgid "Repeat:"
-msgstr "重複:"
+msgstr ""
+#: agent/call-pinentry.c:1116 agent/call-pinentry.c:1128
msgid "PIN too long"
-msgstr "個人識別碼 (PIN) 太長"
+msgstr ""
+#: agent/call-pinentry.c:1117
msgid "Passphrase too long"
-msgstr "密語太長"
+msgstr ""
+#: agent/call-pinentry.c:1125
msgid "Invalid characters in PIN"
-msgstr "個人識別碼 (PIN) 含有無效的字符"
+msgstr ""
+#: agent/call-pinentry.c:1130
msgid "PIN too short"
-msgstr "個人識別碼 (PIN) 太短"
+msgstr ""
+#: agent/call-pinentry.c:1143
msgid "Bad PIN"
-msgstr "不良的個人識別碼 (PIN)"
+msgstr ""
+#: agent/call-pinentry.c:1143
msgid "Bad Passphrase"
-msgstr "不良的密語"
+msgstr ""
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
+msgstr ""
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
-msgstr "無法建立 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
-msgstr "取得此卡片序號時出錯: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
-msgstr "偵測到卡片, 其序號為: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, c-format
msgid "no suitable card key found: %s\n"
-msgstr "找不到合適的卡片金鑰: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2607
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
++#: agent/command-ssh.c:2600
+#, c-format
msgid "error getting list of cards: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
-msgstr "允許"
+msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
-msgstr "拒絕"
+msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
-msgstr "請再次輸入密語"
+msgstr ""
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
-msgstr "從 socket 建立串流失敗: %s\n"
+msgstr ""
+#: agent/divert-scd.c:115
msgid "Please insert the card with serial number"
-msgstr "請插入下列序號的卡片:"
+msgstr ""
+#: agent/divert-scd.c:116
msgid "Please remove the current card and insert the one with serial number"
-msgstr "請移除現用中的卡片並插入下列序號的卡片:"
+msgstr ""
+#: agent/divert-scd.c:244
msgid "Admin PIN"
-msgstr "管理者個人識別碼 (PIN)"
+msgstr ""
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
@@@ -363,102 -297,81 +363,102 @@@ msgid "
"@Options:\n"
" "
msgstr ""
-"@選項:\n"
-" "
+#: agent/gpg-agent.c:152 scd/scdaemon.c:115 dirmngr/dirmngr.c:160
msgid "run in daemon mode (background)"
-msgstr "以服務模式執行 (背景)"
+msgstr ""
+#: agent/gpg-agent.c:153 scd/scdaemon.c:112 dirmngr/dirmngr.c:159
msgid "run in server mode (foreground)"
-msgstr "以伺服器模式執行 (前景)"
+msgstr ""
-#, fuzzy
-#| msgid "run in server mode"
+#: agent/gpg-agent.c:155 dirmngr/dirmngr.c:162
msgid "run in supervised mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
-msgstr "囉唆模式"
+msgstr ""
+#: agent/gpg-agent.c:158 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:304 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "盡量安靜些"
+msgstr ""
+#: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:176
msgid "sh-style command output"
-msgstr "sh 樣式的指令輸出"
+msgstr ""
+#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:177
msgid "csh-style command output"
-msgstr "csh 樣式的指令輸出"
+msgstr ""
+#: agent/gpg-agent.c:161 scd/scdaemon.c:120 sm/gpgsm.c:334
+#: dirmngr/dirmngr.c:178 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
-msgstr "|檔案|從指定檔案中讀取選項"
+msgstr ""
+#: agent/gpg-agent.c:170 scd/scdaemon.c:130 dirmngr/dirmngr.c:181
msgid "do not detach from the console"
-msgstr "不要從 console 分離"
+msgstr ""
+#: agent/gpg-agent.c:171
msgid "do not grab keyboard and mouse"
-msgstr "不要奪取鍵盤及滑鼠"
+msgstr ""
+#: agent/gpg-agent.c:172 tools/symcryptrun.c:180
msgid "use a log file for the server"
-msgstr "為伺服器使用日誌檔"
+msgstr ""
+#: agent/gpg-agent.c:174
msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
+msgstr ""
+#: agent/gpg-agent.c:179
msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
+msgstr ""
+#: agent/gpg-agent.c:181
msgid "do not use the SCdaemon"
-msgstr "不要使用 SCdaemon"
+msgstr ""
-#, fuzzy
-#| msgid "|NAME|connect to host NAME"
+#: agent/gpg-agent.c:185
msgid "|NAME|accept some commands via NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
+#: agent/gpg-agent.c:201
msgid "ignore requests to change the TTY"
-msgstr "忽略變更 TTY 的要求"
+msgstr ""
+#: agent/gpg-agent.c:203
msgid "ignore requests to change the X display"
-msgstr "忽略變更 X display 的要求"
+msgstr ""
+#: agent/gpg-agent.c:206
msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
+msgstr ""
+#: agent/gpg-agent.c:220
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:222
msgid "disallow the use of an external password cache"
-msgstr "不允許重複使用舊密語"
+msgstr ""
+#: agent/gpg-agent.c:224
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "不允許用戶端將金鑰標記為 \"已信任\""
+msgstr ""
+#: agent/gpg-agent.c:227
msgid "allow presetting passphrase"
-msgstr "允許預先設定密語"
+msgstr ""
+#: agent/gpg-agent.c:229
msgid "disallow caller to override the pinentry"
msgstr ""
@@@ -477,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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:494
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
+msgstr ""
+#: agent/gpg-agent.c:496
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
-"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
-msgstr "給定的除錯等級 '%s' 無效\n"
+msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
-msgstr "請注意: 沒有預設選項檔 '%s'\n"
+msgstr ""
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
-msgstr "選項檔 '%s': %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
-msgstr "從 '%s' 讀取選項中\n"
+msgstr ""
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
-msgstr "請注意: '%s' 並不當成選項\n"
+msgstr ""
+#: agent/gpg-agent.c:2101 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1158
#, c-format
msgid "can't create socket: %s\n"
-msgstr "無法建立 socket: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2118 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1171
#, c-format
msgid "socket name '%s' is too long\n"
-msgstr "socket 名稱 '%s' 太長\n"
+msgstr ""
+#: agent/gpg-agent.c:2156
msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
+msgstr ""
+#: agent/gpg-agent.c:2166 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1203
msgid "error getting nonce for the socket\n"
-msgstr "為 socket 取得 nonce 時出錯\n"
+msgstr ""
+#: agent/gpg-agent.c:2171 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1206
#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: agent/gpg-agent.c:2181 agent/gpg-agent.c:2218 scd/scdaemon.c:1126
+#: dirmngr/dirmngr.c:1215
+#, c-format
msgid "can't set permissions of '%s': %s\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
+#: agent/gpg-agent.c:2186 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1220
#, c-format
msgid "listen() failed: %s\n"
-msgstr "listen() 失敗: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2193 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1226
#, c-format
msgid "listening on socket '%s'\n"
-msgstr "正在候聽 socket '%s'\n"
+msgstr ""
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
-msgstr "無法建立目錄 '%s': %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
-msgstr "目錄 '%s' 已建立\n"
+msgstr ""
+#: agent/gpg-agent.c:2266
#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "'%s' 的 stat() 失敗: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2270
#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "無法使用 '%s' 做為家目錄\n"
+msgstr ""
+#: agent/gpg-agent.c:2413 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1959
#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2620
#, c-format
msgid "handler 0x%lx for fd %d started\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
+#: agent/gpg-agent.c:2625
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
+#: agent/gpg-agent.c:2700
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
+#: agent/gpg-agent.c:2705
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
-msgstr "%s %s 已停止\n"
+msgstr ""
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: 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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@指令:\n"
-" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -745,16 -602,13 +745,16 @@@ msgstr "
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:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: 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
@@@ -792,28 -641,24 +792,28 @@@ 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:313 agent/findkey.c:320
msgid "Change passphrase"
-msgstr "更改密語"
+msgstr ""
+#: agent/findkey.c:321
msgid "I'll change it later"
-msgstr "我稍後再變更"
+msgstr ""
- #: agent/findkey.c:1492
-#, fuzzy, c-format
-#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: agent/findkey.c:1490
+#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
-msgstr "刪除金鑰"
+msgstr ""
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1503,178 -1204,132 +1503,178 @@@ msgstr "
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#: g10/call-agent.c:209 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:384 g10/card-util.c:1770
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "沒有可用的 OpenPGP 卡片: %s\n"
+msgstr ""
+#: g10/card-util.c:91 g10/card-util.c:1776
#, c-format
msgid "OpenPGP card no. %s detected\n"
-msgstr "偵測到 OpenPGP 卡片編號 %s\n"
+msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1973 g10/delkey.c:128 g10/keyedit.c:2034
+#: g10/keygen.c:4077 g10/revoke.c:214 g10/revoke.c:619
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:2612
msgid "Reset Code not or not anymore available\n"
-msgstr "(再也) 沒有重設碼\n"
+msgstr ""
+#: g10/card-util.c:142 g10/card-util.c:1536 g10/card-util.c:1652
+#: g10/keyedit.c:1007 g10/keyedit.c:1028 g10/keyedit.c:1042 g10/keygen.c:1773
+#: g10/keygen.c:1934 g10/keygen.c:2302 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:534
msgid "male"
-msgstr "男性"
+msgstr ""
+#: g10/card-util.c:535
msgid "female"
-msgstr "女性"
+msgstr ""
+#: g10/card-util.c:535
msgid "unspecified"
-msgstr "未特定"
+msgstr ""
+#: g10/card-util.c:562
msgid "not forced"
-msgstr "不強迫使用"
+msgstr ""
+#: g10/card-util.c:562
msgid "forced"
-msgstr "強迫使用"
+msgstr ""
+#: g10/card-util.c:712
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
+msgstr ""
+#: g10/card-util.c:714
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "錯誤: 不能使用 \"<\" 字符.\n"
+msgstr ""
+#: g10/card-util.c:716
msgid "Error: Double spaces are not allowed.\n"
-msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
+msgstr ""
+#: g10/card-util.c:733
msgid "Cardholder's surname: "
-msgstr "卡片持有者的姓氏: "
+msgstr ""
+#: g10/card-util.c:735
msgid "Cardholder's given name: "
-msgstr "卡片持有者的名字: "
+msgstr ""
+#: g10/card-util.c:753
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:774
msgid "URL to retrieve public key: "
-msgstr "取回公鑰的 URL: "
+msgstr ""
+#: g10/card-util.c:782
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:877 g10/decrypt-data.c:241 g10/import.c:348
+#: g10/import.c:607 g10/import.c:655 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
+#: dirmngr/dirmngr.c:1597 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:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/card-util.c:937
msgid "Login data (account name): "
-msgstr "登入資料 (帳號名稱): "
+msgstr ""
+#: g10/card-util.c:947
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:983
msgid "Private DO data: "
-msgstr "私人的 DO 資料: "
+msgstr ""
+#: g10/card-util.c:993
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:1076
msgid "Language preferences: "
-msgstr "介面語言偏好設定: "
+msgstr ""
+#: g10/card-util.c:1084
msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 無效的偏好設定字串長度\n"
+msgstr ""
+#: g10/card-util.c:1093
msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
+msgstr ""
+#: g10/card-util.c:1115
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男性, (F)女性或留空): "
+msgstr ""
+#: g10/card-util.c:1129
msgid "Error: invalid response.\n"
-msgstr "錯誤: 無效的回應.\n"
+msgstr ""
+#: g10/card-util.c:1151
msgid "CA fingerprint: "
-msgstr "憑證中心 (CA) 指紋: "
+msgstr ""
+#: g10/card-util.c:1174
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 無效的格式化指紋.\n"
+msgstr ""
+#: g10/card-util.c:1224
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "不可能進行金鑰操作: %s\n"
+msgstr ""
+#: g10/card-util.c:1225
msgid "not an OpenPGP card"
-msgstr "這不是 OpenPGP 卡片"
+msgstr ""
+#: g10/card-util.c:1238 g10/keygen.c:4096 g10/keygen.c:5122
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時出錯: %s\n"
+msgstr ""
+#: g10/card-util.c:1325
msgid "Replace existing key? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
+#: g10/card-util.c:1342
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"
@@@ -1852,132 -1477,100 +1852,132 @@@ msgstr "
msgid "destroy all keys and data"
msgstr ""
+#: g10/card-util.c:2025
msgid "gpg/card> "
-msgstr "gpg/卡片> "
+msgstr ""
+#: g10/card-util.c:2066
msgid "Admin-only command\n"
-msgstr "限管理者使用的指令\n"
+msgstr ""
+#: g10/card-util.c:2097
msgid "Admin commands are allowed\n"
-msgstr "允許使用管理者指令\n"
+msgstr ""
+#: g10/card-util.c:2099
msgid "Admin commands are not allowed\n"
-msgstr "未允許使用管理者指令\n"
+msgstr ""
+#: g10/card-util.c:2194 g10/keyedit.c:2826
msgid "Invalid command (try \"help\")\n"
-msgstr "無效的指令 (試試看 \"help\")\n"
+msgstr ""
+#: g10/decrypt.c:190 g10/encrypt.c:958
msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個指令中沒有作用\n"
+msgstr ""
- #: g10/decrypt.c:246 g10/gpg.c:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
-msgstr "無法開啟 '%s'\n"
+msgstr ""
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
+msgstr ""
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, 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:578
+#, 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:202
#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "刪除私鑰 %s 時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:204
msgid "key"
-msgstr "金鑰"
+msgstr ""
+#: g10/delkey.c:204
msgid "subkey"
-msgstr "子鑰"
+msgstr ""
+#: g10/delkey.c:227
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "刪除金鑰區塊時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:240
msgid "ownertrust information cleared\n"
-msgstr "主觀信任資訊已清除\n"
+msgstr ""
+#: g10/delkey.c:276
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
+msgstr ""
+#: g10/delkey.c:278
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
+msgstr ""
+#: g10/encrypt.c:233 g10/sign.c:1304
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "建立密語時出錯: %s\n"
+msgstr ""
+#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr ""
+#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
-msgstr "正在使用 %s 編密法\n"
+msgstr ""
+#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
-msgstr "'%s' 已經被壓縮了\n"
+msgstr ""
+#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:611
#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "警告: '%s' 是個空檔案\n"
+msgstr ""
+#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
-msgstr "正在從 '%s' 讀取\n"
+msgstr ""
+#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2099,312 -1667,260 +2099,312 @@@ msgstr "
msgid "use the GnuPG key backup format"
msgstr ""
+#: g10/export.c:1235
msgid " - skipped"
-msgstr " - 已跳過"
+msgstr ""
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
-msgstr "正在寫入 '%s'\n"
+msgstr ""
+#: g10/export.c:1708
#, c-format
msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
+msgstr ""
+#: g10/export.c:1903
msgid "exporting secret keys not allowed\n"
-msgstr "不允許匯出私鑰\n"
+msgstr ""
+#: g10/export.c:1980
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
+msgstr ""
+#: g10/export.c:2067
msgid "WARNING: nothing exported\n"
-msgstr "警告: 沒有匯出任何東西\n"
+msgstr ""
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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:256
msgid "[User ID not found]"
-msgstr "[找不到使用者 ID]"
+msgstr ""
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
+#, c-format
msgid "(check argument of option '%s')\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
+#: g10/getkey.c:515
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: g10/getkey.c:545
+#, c-format
msgid "error looking up: %s\n"
-msgstr "關閉 %s 時出錯: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error creating keyring '%s': %s\n"
+#: g10/getkey.c:635
+#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/getkey.c:1451
#, c-format
msgid "automatically retrieved '%s' via %s\n"
-msgstr "已自動取回 '%s' (經由 %s )\n"
+msgstr ""
+#: g10/getkey.c:1457
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
-msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
+msgstr ""
+#: g10/getkey.c:1459
msgid "No fingerprint"
-msgstr "沒有指紋"
+msgstr ""
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
-msgstr "找不到私鑰 \"%s\": %s\n"
+msgstr ""
- #: g10/getkey.c:1975
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1976
+#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
- #: g10/getkey.c:1983
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1984
+#, c-format
msgid "using \"%s\" as default secret key for signing\n"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
+msgstr ""
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
-msgstr "使用子鑰 %s 來替換主鑰 %s\n"
+msgstr ""
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
-msgstr "建立簽章"
+msgstr ""
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
-msgstr "建立明文簽章"
+msgstr ""
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
-msgstr "建立分離式簽章"
+msgstr ""
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
-msgstr "加密資料"
+msgstr ""
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
-msgstr "僅使用對稱式編密法來加密"
+msgstr ""
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
-msgstr "資料解密 (預設)"
+msgstr ""
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
-msgstr "驗證簽章"
+msgstr ""
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
-msgstr "列出金鑰和簽章"
+msgstr ""
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
-msgstr "列出並檢查金鑰簽章"
+msgstr ""
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
-msgstr "列出金鑰和指紋"
+msgstr ""
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
-msgstr "列出私鑰"
+msgstr ""
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
-msgstr "產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:455
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:460
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:463
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:466
msgid "quickly set a new expiration date"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
-msgstr "全能金鑰對生成"
+msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
-msgstr "產生撤銷憑證"
+msgstr ""
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
-msgstr "快速簽署金鑰"
+msgstr ""
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
-msgstr "快速在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
-msgstr "簽署金鑰"
+msgstr ""
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
-msgstr "僅在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
-msgstr "簽署或編輯金鑰"
+msgstr ""
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
-msgstr "匯出金鑰"
+msgstr ""
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
-msgstr "把金鑰匯出至金鑰伺服器"
+msgstr ""
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
-msgstr "從金鑰伺服器匯入金鑰"
+msgstr ""
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
-msgstr "在金鑰伺服器上搜尋金鑰"
+msgstr ""
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
-msgstr "從金鑰伺服器更新所有的金鑰"
+msgstr ""
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
-msgstr "匯入/合併金鑰"
+msgstr ""
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
-msgstr "列印卡片狀態"
+msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
-msgstr "變更卡片上的資料"
+msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
-msgstr "變更卡片的個人識別碼 (PIN)"
+msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
-msgstr "更新信任資料庫"
+msgstr ""
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
-msgstr "印出訊息摘要"
+msgstr ""
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
-msgstr "建立以 ASCII 封裝過的輸出"
+msgstr ""
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
+msgstr ""
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+msgstr ""
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
+msgstr ""
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
-msgstr "使用標準的文字模式"
+msgstr ""
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
-msgstr "|檔案|將輸出寫入至指定檔案"
+msgstr ""
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
-msgstr "不要做任何改變"
+msgstr ""
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
-msgstr "覆寫前先詢問"
+msgstr ""
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
-msgstr "使用嚴謹的 OpenPGP 行為"
+msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-"@\n"
-"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:679
-#, fuzzy
-#| msgid ""
-#| "@\n"
-#| "Examples:\n"
-#| "\n"
-#| " -se -r Bob [file] sign and encrypt for user Bob\n"
-#| " --clear-sign [file] make a clear text signature\n"
-#| " --detach-sign [file] make a detached signature\n"
-#| " --list-keys [names] show keys\n"
-#| " --fingerprint [names] show fingerprints\n"
++#: g10/gpg.c:682
msgid ""
"@\n"
"Examples:\n"
@@@ -2415,558 -1931,455 +2415,558 @@@
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
msgstr ""
-"@\n"
-"範例:\n"
-"\n"
-" -se -r Bob [檔案] 對 Bob 這個使用者簽署及加密\n"
-" --clear-sign [檔案] 做出明文簽章\n"
-" --detach-sign [檔案] 做出分離式簽章\n"
-" --list-keys [名字] 顯示金鑰\n"
-" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
+msgstr ""
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"語法: @GPG@ [選項] [檔案]\n"
-"簽署, 檢查, 加密, 解密\n"
-"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"已支援的演算法:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
-msgstr "公鑰: "
+msgstr ""
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
-msgstr "編密法: "
+msgstr ""
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
-msgstr "雜湊: "
+msgstr ""
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
-msgstr "壓縮: "
+msgstr ""
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "用法: %s [選項] %s\n"
+msgstr ""
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
-msgstr "指令彼此矛盾\n"
+msgstr ""
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
+msgstr ""
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "未知的組態項目 '%s'\n"
+msgstr ""
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
-msgstr "列出金鑰時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
-msgstr "列出金鑰時顯示金鑰用途資訊"
+msgstr ""
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
-msgstr "列出簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
-msgstr "列出簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
-msgstr "列出簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
-msgstr "列出簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
-msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
-msgstr "列出金鑰時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
+msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
-msgstr "在金鑰清單中顯示鑰匙圈名稱"
+msgstr ""
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
-msgstr "列出簽章時顯示有效期限"
+msgstr ""
- #: g10/gpg.c:2055 g10/gpg.c:2092
-#, fuzzy, c-format
-#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2058 g10/gpg.c:2095
+#, c-format
msgid "valid values for option '%s':\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
+msgstr ""
- #: g10/gpg.c:2066
-#, fuzzy, c-format
-#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2069
+#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
-#, fuzzy, c-format
-#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2105 g10/keygen.c:168
+#, c-format
msgid "invalid value for option '%s'\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
+msgstr ""
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "請注意: 一般情況下不採用 %s!\n"
+msgstr ""
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "'%s' 不是有效的簽章使用期限\n"
+msgstr ""
- #: g10/gpg.c:3052
-#, fuzzy, c-format
-#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3055
+#, c-format
msgid "\"%s\" is not a proper mail address\n"
-msgstr "第 %d 列: 不是有效的電子郵件地址\n"
+msgstr ""
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "無效的個人識別碼項目模式 '%s'\n"
+msgstr ""
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "'%s' 不是有效的字元集\n"
+msgstr ""
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
-msgstr "無法剖析金鑰伺服器 URL\n"
+msgstr ""
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: 無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: 無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
-msgstr "無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3198 g10/gpg.c:3213
-#, fuzzy, c-format
-#| msgid "invalid list options\n"
++#: g10/gpg.c:3201 g10/gpg.c:3216
+#, c-format
msgid "invalid filter option: %s\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: 無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
-msgstr "無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: 無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
-msgstr "驗證簽章時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
-msgstr "驗證簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
-msgstr "驗證簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
-msgstr "驗證簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
-msgstr "驗證簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
-msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
-msgstr "驗證簽章時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
-msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
-msgstr "驗證簽章時祇顯示主要的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
-msgstr "以 PKA 資料驗證簽章"
+msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
-msgstr "提高對持有有效 PKA 資料之簽章的信任"
+msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: 無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
-msgstr "無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "無法把執行檔路徑設成 %s\n"
+msgstr ""
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: 無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
-msgstr "無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
-msgstr "警告: 程式可能會傾印出核心檔!\n"
+msgstr ""
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s 不允許跟 %s 併用!\n"
+msgstr ""
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s 跟 %s 放在一起沒有意義!\n"
+msgstr ""
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
-msgstr "警告: 正在偽造的系統時間中執行: "
+msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
-msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
+msgstr ""
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
-msgstr "所選的編密演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
-msgstr "所選的摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
-msgstr "所選的壓縮演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
-msgstr "所選的憑證摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed 一定要大於 0\n"
+msgstr ""
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed 一定要大於 1\n"
+msgstr ""
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
+msgstr ""
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
+msgstr ""
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
-msgstr "無效的預設偏好\n"
+msgstr ""
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
-msgstr "無效的個人編密法偏好\n"
+msgstr ""
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
-msgstr "無效的個人摘要偏好\n"
+msgstr ""
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
-msgstr "無效的個人壓縮偏好\n"
+msgstr ""
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s 還沒辦法跟 %s 一起運作\n"
+msgstr ""
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "信任資料庫啟始失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
+msgstr ""
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "'%s' 對稱式加密失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "送至金鑰伺服器失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "從金鑰伺服器接收失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4524
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4527
+#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "用金鑰伺服器搜尋失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "從金鑰伺服器更新失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "解開封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "進行封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "無效的雜湊演算法 '%s'\n"
+msgstr ""
- #: g10/gpg.c:4868 g10/tofu.c:2151
-#, fuzzy, c-format
-#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4871 g10/tofu.c:2155
+#, c-format
msgid "error parsing key specification '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
-msgstr "請開始輸入你的訊息 ...\n"
+msgstr ""
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
-msgstr "給定的的憑證原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
-msgstr "給定的簽章原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr ""
+#: g10/gpgv.c:79
msgid "|FILE|take the keys from the keyring FILE"
-msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
+msgstr ""
+#: g10/gpgv.c:82
msgid "make timestamp conflicts only a warning"
-msgstr "僅把時間戳印矛盾視為警告"
+msgstr ""
+#: g10/gpgv.c:84 sm/gpgsm.c:347
msgid "|FD|write status info to this FD"
-msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
+msgstr ""
+#: g10/gpgv.c:89
msgid "|ALGO|reject signatures made with ALGO"
msgstr ""
@@@ -3326,234 -2676,198 +3326,234 @@@ msgstr "
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
+#: g10/import.c:2377
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
+msgstr ""
+#: g10/import.c:2426
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
+msgstr ""
+#: g10/import.c:2459
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
+msgstr ""
+#: g10/import.c:2535
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
+msgstr ""
+#: g10/import.c:2552
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
+msgstr ""
+#: g10/import.c:2554
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
+msgstr ""
+#: g10/import.c:2571 g10/import.c:2597 g10/import.c:2648
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
+#: g10/import.c:2572
#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
+msgstr ""
+#: g10/import.c:2586
#, c-format
msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
+msgstr ""
+#: g10/import.c:2599
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "金鑰 %s: 無效的附帶子鑰\n"
+msgstr ""
+#: g10/import.c:2615
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
+msgstr ""
+#: g10/import.c:2637
#, c-format
msgid "key %s: no subkey for key revocation\n"
-msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
+msgstr ""
+#: g10/import.c:2650
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "金鑰 %s: 無效的子鑰撤銷\n"
+msgstr ""
+#: g10/import.c:2665
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
+msgstr ""
+#: g10/import.c:2708
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
+msgstr ""
+#: g10/import.c:2732
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "金鑰 %s: 子鑰已跳過\n"
+msgstr ""
-# here we violate the rfc a bit by still allowing
-# * to import non-exportable signature when we have the
-# * the secret key used to create this signature - it
-# * seems that this makes sense
+#: g10/import.c:2761
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
+msgstr ""
+#: g10/import.c:2772
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
+msgstr ""
+#: g10/import.c:2790
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
+msgstr ""
+#: g10/import.c:2804
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr ""
+#: g10/import.c:2812
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+msgstr ""
+#: g10/import.c:2954
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
+msgstr ""
+#: g10/import.c:3018
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
+msgstr ""
+#: g10/import.c:3034
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
+msgstr ""
+#: g10/import.c:3098
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
+msgstr ""
+#: g10/import.c:3136
#, c-format
msgid "key %s: direct key signature added\n"
-msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
+msgstr ""
+#: g10/keydb.c:425 g10/keydb.c:452 sm/keydb.c:213 sm/keydb.c:226
#, c-format
msgid "error creating keybox '%s': %s\n"
-msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:428 g10/keydb.c:455
#, c-format
msgid "error creating keyring '%s': %s\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:464 sm/keydb.c:232
#, c-format
msgid "keybox '%s' created\n"
-msgstr "鑰匙盒 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:466
#, c-format
msgid "keyring '%s' created\n"
-msgstr "鑰匙圈 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:844
#, c-format
msgid "keyblock resource '%s': %s\n"
-msgstr "金鑰區塊資源 '%s': %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
+#: g10/keydb.c:950
+#, c-format
msgid "error opening key DB: %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:1750
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
-msgstr "重新建立鑰匙圈快取失敗: %s\n"
+msgstr ""
+#: g10/keyedit.c:268
msgid "[revocation]"
-msgstr "[撤銷]"
+msgstr ""
+#: g10/keyedit.c:268
msgid "[self-signature]"
-msgstr "[自我簽章]"
+msgstr ""
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
-msgstr "配置記憶體時出錯: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
+#: g10/keyedit.c:633
+#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#: g10/keyedit.c:642
+#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "卡片不支援 %s 摘要演算法\n"
+msgstr ""
-#, fuzzy
-#| msgid "Good signature from"
+#: g10/keyedit.c:805
msgid " (reordered signatures follow)"
-msgstr "完好的簽章來自於"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
+#: g10/keyedit.c:918
+#, c-format
msgid "key %s:\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#: g10/keyedit.c:921
+#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
+#: g10/keyedit.c:924 g10/keylist.c:481
+#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#: g10/keyedit.c:928 g10/keylist.c:477
+#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#: g10/keyedit.c:932
+#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
-msgstr[0] "完好的簽章來自於"
+msgstr[0] ""
+msgstr[1] ""
+#: g10/keyedit.c:937
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -4216,19 -3409,15 +4216,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
-msgstr "已撤銷"
+msgstr ""
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
-msgstr "已過期"
+msgstr ""
+#: g10/keyedit.c:4352
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"
@@@ -5078,54 -4141,45 +5078,54 @@@ msgstr "
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1765
msgid " Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
+#: g10/keylist.c:1767 g10/keylist.c:1777
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
-# use tty
+#: g10/keylist.c:1772 g10/keylist.c:1788
msgid " Key fingerprint ="
-msgstr " 金鑰指紋 ="
+msgstr ""
+#: g10/keylist.c:1839
msgid " Card serial no. ="
-msgstr " 卡片序號 ="
+msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
-msgstr "快取鑰匙圈 '%s' 中\n"
+msgstr ""
- #: g10/keyring.c:1536
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
++#: g10/keyring.c:1541
+#, 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:1552
-#, fuzzy, c-format
-#| msgid "flush the cache"
++#: g10/keyring.c:1557
+#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
-msgstr[0] "清除快取"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1554
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
++#: g10/keyring.c:1559
+#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
-msgstr[0] "1 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
-msgstr "%s: 鑰匙圈已建立\n"
+msgstr ""
+#: g10/keyserver.c:91
msgid "override proxy options set for dirmngr"
msgstr ""
@@@ -5141,284 -4192,226 +5141,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:1423 g10/keyserver.c:1456
+#, 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:1430
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+msgstr ""
+#: g10/keyserver.c:1534
#, c-format
msgid "key \"%s\" not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
+msgstr ""
+#: g10/keyserver.c:1537
msgid "key not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰\n"
+msgstr ""
+#: g10/keyserver.c:1541
msgid "no keyserver known (use option --keyserver)\n"
-msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
+msgstr ""
+#: g10/keyserver.c:1706
#, c-format
msgid "requesting key %s from %s server %s\n"
-msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
+msgstr ""
+#: g10/keyserver.c:1710
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "正在請求金鑰 %s 自 %s\n"
+msgstr ""
-#, fuzzy
-#| msgid "invalid keyserver options\n"
+#: g10/keyserver.c:1811 g10/keyserver.c:1967
msgid "no keyserver known\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
-msgstr "已跳過 \"%s\": %s\n"
+msgstr ""
+#: g10/keyserver.c:1829
#, c-format
msgid "sending key %s to %s\n"
-msgstr "遞送金鑰 %s 至 %s\n"
+msgstr ""
+#: g10/keyserver.c:1870
#, c-format
msgid "requesting key from '%s'\n"
-msgstr "正在向 '%s' 請求金鑰\n"
+msgstr ""
+#: g10/keyserver.c:1886
#, 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:1223 g10/mainproc.c:1266
msgid "no signature found\n"
-msgstr "找不到簽章\n"
+msgstr ""
+#: g10/mainproc.c:1600
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "*損壞* 的簽章來自於 \"%s\""
+msgstr ""
+#: g10/mainproc.c:1602
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "過期的簽章來自於 \"%s\""
+msgstr ""
+#: g10/mainproc.c:1604
#, c-format
msgid "Good signature from \"%s\""
-msgstr "完好的簽章來自於 \"%s\""
+msgstr ""
+#: g10/mainproc.c:1623
msgid "signature verification suppressed\n"
-msgstr "簽章驗證已抑制\n"
+msgstr ""
+#: g10/mainproc.c:1732
msgid "can't handle this ambiguous signature data\n"
-msgstr "無法處理這個不明確的簽章資料\n"
+msgstr ""
+#: g10/mainproc.c:1746 g10/mainproc.c:1754
#, c-format
msgid "Signature made %s\n"
-msgstr "由 %s 建立的簽章\n"
+msgstr ""
+#: g10/mainproc.c:1747 g10/mainproc.c:1755
#, c-format
msgid " using %s key %s\n"
-msgstr " 使用 %s 金鑰 %s\n"
+msgstr ""
+#: g10/mainproc.c:1759
#, 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:1765
+#, c-format
msgid " issuer \"%s\"\n"
-msgstr " 亦即 \"%s\""
+msgstr ""
+#: g10/mainproc.c:1782
msgid "Key available at: "
-msgstr "可用的金鑰於: "
+msgstr ""
+#: g10/mainproc.c:2017
msgid "[uncertain]"
-msgstr "[ 不確定 ]"
+msgstr ""
+#: g10/mainproc.c:2055
#, c-format
msgid " aka \"%s\""
-msgstr " 亦即 \"%s\""
+msgstr ""
+#: g10/mainproc.c:2138
#, c-format
msgid "Signature expired %s\n"
-msgstr "這份簽署已經在 %s 過期了\n"
+msgstr ""
+#: g10/mainproc.c:2142
#, c-format
msgid "Signature expires %s\n"
-msgstr "這份簽署將在 %s 到期\n"
+msgstr ""
+#: g10/mainproc.c:2153
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
+msgstr ""
+#: g10/mainproc.c:2154
msgid "binary"
-msgstr "二進制"
+msgstr ""
+#: g10/mainproc.c:2155
msgid "textmode"
-msgstr "文字模式"
+msgstr ""
+#: g10/mainproc.c:2155 g10/trust.c:103 dirmngr/ocsp.c:706
msgid "unknown"
-msgstr "未知"
+msgstr ""
+#: g10/mainproc.c:2157
msgid ", key algorithm "
-msgstr ", 金鑰演算法 "
+msgstr ""
+#: g10/mainproc.c:2192
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
@@@ -5499,164 -4478,122 +5499,154 @@@ msgstr "
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
+msgstr ""
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告: 已不建議使用 \"%s\" 選項\n"
+msgstr ""
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
-msgstr "請改以 \"%s%s\" 代替\n"
+msgstr ""
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
+msgstr ""
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
-msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
+msgstr ""
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, 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:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
-msgstr "未壓縮"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
-msgstr "uncompressed|none|未壓縮|無"
+msgstr ""
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
-msgstr "這個訊息對 %s 來說無法使用\n"
+msgstr ""
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "不明確的選項 '%s'\n"
+msgstr ""
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
-msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
+msgstr ""
- #: g10/misc.c:1845
-#, fuzzy, c-format
-#| msgid "Unknown signature type '%s'\n"
++#: g10/misc.c:1848
+#, c-format
msgid "unknown weak digest '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
-msgstr "檔案 '%s' 已存在. "
+msgstr ""
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
-msgstr "是否覆寫? (y/N) "
+msgstr ""
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
-msgstr "%s: 未知的副檔名\n"
+msgstr ""
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
-msgstr "請輸入新的檔名"
+msgstr ""
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
-msgstr "寫到標準輸出中\n"
+msgstr ""
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, 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 ""
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\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:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
+msgstr ""
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d 類別的子封包設定了關鍵位元\n"
+msgstr ""
+#: 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:244
msgid "Enter passphrase\n"
-msgstr "請輸入密語\n"
+msgstr ""
+#: g10/passphrase.c:255
msgid "cancelled by user\n"
-msgstr "由使用者所取消\n"
+msgstr ""
+#: g10/passphrase.c:493
#, c-format
msgid " (main key ID %s)"
-msgstr " (主要金鑰 ID %s)"
+msgstr ""
+#: g10/passphrase.c:500
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
-msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
+msgstr ""
+#: g10/passphrase.c:504
msgid "Please enter the passphrase to import the OpenPGP secret key:"
-msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
+msgstr ""
+#: g10/passphrase.c:509
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
-msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
+msgstr ""
+#: g10/passphrase.c:512
msgid "Please enter the passphrase to export the OpenPGP secret key:"
-msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
+msgstr ""
+#: g10/passphrase.c:517
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
-msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
+msgstr ""
+#: g10/passphrase.c:520
msgid "Do you really want to permanently delete the OpenPGP secret key:"
-msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
+msgstr ""
+#: g10/passphrase.c:529
#, c-format
msgid ""
"%s\n"
@@@ -6327,226 -5193,182 +6317,226 @@@ msgstr "
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
+msgstr ""
+#: g10/sign.c:1021
msgid "signing:"
-msgstr "簽署:"
+msgstr ""
+#: g10/sign.c:1298
#, c-format
msgid "%s encryption will be used\n"
-msgstr "%s 加密將被採用\n"
+msgstr ""
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
+msgstr ""
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "已跳過 \"%s\": 重複了\n"
+msgstr ""
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
-msgstr "已跳過: 私鑰已經存在\n"
+msgstr ""
- #: g10/skclist.c:225
++#: g10/skclist.c:251
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:221
#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbdump.c:225
#, c-format
msgid "read error in '%s': %s\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: 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:1789
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:213 g10/tdbio.c:1800
#, 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:683
#, c-format
msgid "%s: directory does not exist!\n"
-msgstr "%s: 目錄不存在!\n"
+msgstr ""
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
-msgstr "無法存取 '%s': %s\n"
+msgstr ""
+#: g10/tdbio.c:725
#, c-format
msgid "%s: failed to create version record: %s"
-msgstr "%s: 建立版本記錄失敗: %s"
+msgstr ""
+#: g10/tdbio.c:730
#, c-format
msgid "%s: invalid trustdb created\n"
-msgstr "%s: 建立了無效的信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:733
#, c-format
msgid "%s: trustdb created\n"
-msgstr "%s: 建立了信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:789
msgid "Note: trustdb not writable\n"
-msgstr "請注意: 信任資料庫不可寫入\n"
+msgstr ""
+#: g10/tdbio.c:798
#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%s: 無效的信任資料庫\n"
+msgstr ""
+#: g10/tdbio.c:835
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: 建立雜湊表失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:843
#, c-format
msgid "%s: error updating version record: %s\n"
-msgstr "%s: 更新版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:866 g10/tdbio.c:892 g10/tdbio.c:910 g10/tdbio.c:930
+#: g10/tdbio.c:965 g10/tdbio.c:1713 g10/tdbio.c:1742
#, c-format
msgid "%s: error reading version record: %s\n"
-msgstr "%s: 讀取版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:939
#, c-format
msgid "%s: error writing version record: %s\n"
-msgstr "%s: 寫入版本記錄時錯誤: %s\n"
+msgstr ""
+#: g10/tdbio.c:1463
#, c-format
msgid "trustdb: lseek failed: %s\n"
-msgstr "信任資料庫: 本機搜尋失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1474
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
+msgstr ""
+#: g10/tdbio.c:1499
#, c-format
msgid "%s: not a trustdb file\n"
-msgstr "%s: 不是一個信任資料庫檔案\n"
+msgstr ""
+#: g10/tdbio.c:1524
#, c-format
msgid "%s: version record with recnum %lu\n"
-msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
+msgstr ""
+#: g10/tdbio.c:1530
#, c-format
msgid "%s: invalid file version %d\n"
-msgstr "%s: 無效的檔案版本 %d\n"
+msgstr ""
+#: g10/tdbio.c:1750
#, c-format
msgid "%s: error reading free record: %s\n"
-msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbio.c:1759
#, c-format
msgid "%s: error writing dir record: %s\n"
-msgstr "%s: 寫入目錄記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbio.c:1770
#, c-format
msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: 記錄歸零失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1806
#, c-format
msgid "%s: failed to append a record: %s\n"
-msgstr "%s: 附加記錄失敗: %s\n"
+msgstr ""
+#: g10/tdbio.c:1867
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 ""
@@@ -6570,45 -5390,40 +6560,45 @@@ msgstr "
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
+#, 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:3445 g10/tofu.c:3583
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
+#, 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."
@@@ -6632,267 -5443,219 +6622,263 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
-#, fuzzy, c-format
-#| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1609
+#, c-format
msgid "error gathering other user IDs: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1615
-#, fuzzy
-#| msgid "list key and user IDs"
++#: g10/tofu.c:1619
msgid "This key's user IDs:\n"
-msgstr "列出金鑰和使用者 ID"
+msgstr ""
- #: g10/tofu.c:1631 g10/tofu.c:1796
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:1635 g10/tofu.c:1800
+#, c-format
msgid "policy: %s"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/tofu.c:1722
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:1726
+#, c-format
msgid "error gathering signature stats: %s\n"
-msgstr "取得已存放的旗標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
-#, fuzzy
-#| msgid "list keys"
++#: g10/tofu.c:1798
msgid "this key"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/tofu.c:1820
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1824
+#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
-msgstr[0] "印出訊息摘要"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1824
-#, fuzzy, c-format
-#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:1828
+#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
-msgstr[0] "已用 %lu 個密語加密了\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1831
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1835
+#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
-msgstr[0] "印出訊息摘要"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1835
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1839
+#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
-msgstr[0] "印出訊息摘要"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:1903
+#, c-format
msgid "Messages encrypted in the past: %d."
-msgstr "印出訊息摘要"
+msgstr ""
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
-#, fuzzy, c-format
-#| msgid "error writing key: %s\n"
++#: g10/tofu.c:2147
+#, c-format
msgid "resetting keydb: %s\n"
-msgstr "寫入金鑰時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2610
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:2614
+#, c-format
msgid "error setting TOFU binding's policy to %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2823
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:2827
+#, c-format
msgid "error changing TOFU policy: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
-#, fuzzy, c-format
-#| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:3150
+#, c-format
msgid "%s: Verified 0 signatures."
-msgstr "已經刪除了 %d 份簽章.\n"
+msgstr ""
- #: g10/tofu.c:3154
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:3158
+#, 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:3164
-#, fuzzy
-#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:3168
msgid "Encrypted 0 messages."
-msgstr "已用 %lu 個密語加密了\n"
+msgstr ""
- #: g10/tofu.c:3172
-#, fuzzy, c-format
-#| msgid "print message digests"
++#: g10/tofu.c:3176
+#, 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:3183
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:3187
+#, c-format
msgid "(policy: %s)"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -6907,133 -5670,107 +6893,133 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
+#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
-#, fuzzy, c-format
-#| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3917
+#, 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:488
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:494
#, c-format
msgid "using %s trust model\n"
-msgstr "正在使用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:543
msgid "no need for a trustdb check\n"
-msgstr "不需要檢查信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:549 g10/trustdb.c:2233
#, c-format
msgid "next trustdb check due at %s\n"
-msgstr "下次信任資料庫檢查將於 %s 進行\n"
+msgstr ""
+#: g10/trustdb.c:558
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:574
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:798 g10/trustdb.c:1382
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "找不到公鑰 %s: %s\n"
+msgstr ""
+#: g10/trustdb.c:1015
msgid "please do a --check-trustdb\n"
-msgstr "請做一次 --check-trustdb\n"
+msgstr ""
+#: g10/trustdb.c:1020
msgid "checking the trustdb\n"
-msgstr "正在檢查信任資料庫\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%lu keys processed so far\n"
+#: g10/trustdb.c:1954
+#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
-msgstr[0] "目前已處理 %lu 把金鑰\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
+#: g10/trustdb.c:1957
+#, 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:2027
msgid "no ultimately trusted keys found\n"
-msgstr "沒有找到任何徹底信任的金鑰\n"
+msgstr ""
+#: g10/trustdb.c:2041
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
-msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
+msgstr ""
+#: g10/trustdb.c:2159
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -8908,157 -7279,122 +8894,157 @@@ msgstr "
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
-msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
+msgstr ""
+#: dirmngr/crlcache.c:2300
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
-msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
+msgstr ""
+#: dirmngr/crlcache.c:2303
msgid " ERROR: The CRL will not be used\n"
-msgstr " 錯誤: 將不採用此 CRL\n"
+msgstr ""
+#: dirmngr/crlcache.c:2310
msgid " ERROR: This cached CRL may have been tampered with!\n"
-msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
+msgstr ""
+#: dirmngr/crlcache.c:2328
msgid " WARNING: invalid cache record length\n"
-msgstr " 警告: 無效的快取記錄長度\n"
+msgstr ""
+#: dirmngr/crlcache.c:2335
#, c-format
msgid "problem reading cache record: %s\n"
-msgstr "讀取快取記錄時發生問題: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2346
#, c-format
msgid "problem reading cache key: %s\n"
-msgstr "讀取快取金鑰時發生問題: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2377
#, c-format
msgid "error reading cache entry from db: %s\n"
-msgstr "從資料庫讀取快取項目時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlcache.c:2380
msgid "End CRL dump\n"
-msgstr "CRL 傾印結束\n"
+msgstr ""
+#: dirmngr/crlcache.c:2501
#, c-format
msgid "crl_fetch via DP failed: %s\n"
-msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
+msgstr ""
+#: 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: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:183
msgid "using \"http\" instead of \"https\"\n"
-msgstr "正改以 \"http\" 代替 \"https\"\n"
+msgstr ""
+#: dirmngr/crlfetch.c:194 dirmngr/crlfetch.c:293 dirmngr/crlfetch.c:331
+#: dirmngr/crlfetch.c:363
#, c-format
msgid "CRL access not possible due to disabled %s\n"
-msgstr "不可能存取 CRL 因已停用 %s\n"
+msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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:253 dirmngr/ocsp.c:220
#, c-format
msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
+msgstr ""
+#: dirmngr/crlfetch.c:272 dirmngr/ocsp.c:237
msgid "too many redirections\n"
-msgstr "太多重新導向\n"
+msgstr ""
+#: dirmngr/crlfetch.c:278
#, c-format
msgid "error retrieving '%s': %s\n"
-msgstr "取回 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/crlfetch.c:283
#, c-format
msgid "error retrieving '%s': http status %u\n"
-msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
+msgstr ""
-#, fuzzy
-#| msgid "CRL access not possible due to disabled %s\n"
+#: dirmngr/crlfetch.c:300 dirmngr/crlfetch.c:326 dirmngr/crlfetch.c:358
+#: dirmngr/crlfetch.c:385
msgid "CRL access not possible due to Tor mode\n"
-msgstr "不可能存取 CRL 因已停用 %s\n"
+msgstr ""
+#: dirmngr/crlfetch.c:390
#, 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"
diff --cc po/hu.po
index f8156ba,828f66c..a803365
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -104,8 -86,6 +104,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "rossz jelszó"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -150,95 -122,66 +150,95 @@@ msgstr "hibás MPI
msgid "Bad Passphrase"
msgstr "rossz jelszó"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s védő algoritmus nem támogatott.\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "jelszóváltoztatás"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
@@@ -404,10 -316,6 +404,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "A kulcsot lecserélték."
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "bőbeszédű mód"
@@@ -516,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -536,36 -412,25 +536,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -612,15 -468,11 +612,15 @@@ msgstr "Frissítés sikertelen: %s.\n
msgid "listening on socket '%s'\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: Könyvtárat létrehoztam.\n"
@@@ -660,18 -505,14 +660,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@@ -687,8 -526,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -533,6 +696,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -812,8 -627,6 +812,8 @@@ msgstr "
msgid "Yes"
msgstr "igen"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -670,16 +864,19 @@@ msgstr "jelszóváltoztatás
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "kulcs engedélyezése"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1737,8 -1353,6 +1737,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
@@@ -2034,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@@ -2285,8 -1782,6 +2285,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2311,8 -1802,6 +2311,8 @@@ msgstr "%08lX kulcs: PGP 2.x stílusú
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem exportáltam.\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2323,8 -1811,6 +2323,8 @@@ msgstr "Hiba \"%s\" létrehozásakor: %
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "Érvénytelen import opciók!\n"
@@@ -2360,258 -1840,202 +2360,258 @@@ msgstr "Hiba \"%s\" létrehozásakor: %
msgid "No fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "\"%s\" titkos kulcs nem található: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"%08lX érvénytelen kulcsot érvényesítettük az\n"
"--allow-non-selfsigned-uid opcióval.\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsődleges helyett.\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "különálló aláírás készítése"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fájl]|olvasható szöveg aláírása"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "különálló aláírás készítése"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "adat titkosítása"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "titkosítás csak szimmetrikus rejtjelezővel"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "adat visszafejtése (alapértelmezés)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "aláírás ellenőrzése"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "kulcsok listázása"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "kulcsok és aláírások listázása"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsaláírások ellenőrzése"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "kulcsok és ujjlenyomatok listázása"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "titkos kulcsok listázása"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "új kulcspár létrehozása"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "visszavonási igazolás készítése"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "kulcs aláírása"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "kulcs aláírása helyileg"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "kulcs aláírása"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "kulcs aláírása helyileg"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "kulcs aláírása vagy szerkesztése"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "jelszóváltoztatás"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "kulcsok exportálása"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "kulcsok exportálása kulcsszerverre"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "kulcsok importálása kulcsszerverről"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "kulcsok keresése kulcsszerveren"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "minden kulcs frissítése kulcsszerverről"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "kulcsok importálása/összefűzése"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "bizalmi adatbázis frissítése"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "ascii páncélozott kimenet létrehozása"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NÉV|titkosítás NÉV részére"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "kanonikus szöveges mód használata"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 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"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ne csináljon semmi változtatást"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "felülírás előtt rákérdezés"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2619,7 -2043,6 +2619,7 @@@ msgstr "
"@\n"
"(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2649,13 -2072,11 +2649,13 @@@ msgstr "
" --list-keys [nevek] kulcsok kiíratása\n"
" --fingerprint [nevek] ujjlenyomatok kiíratása\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2670,7 -2091,6 +2670,7 @@@ msgstr "
"Aláírás, ellenőrzés, titkosítás vagy visszafejtés.\n"
"Az alapértelmezett művelet a bemeneti adattól függ.\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2678,548 -2098,432 +2678,548 @@@ msgstr "
"\n"
"Támogatott algoritmusok:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Nyilvános kulcsú (pubkey): "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Rejtjelező (cipher): "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Kivonatoló (hash): "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Tömörítő (compression): "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Használat: gpg [opciók] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, 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:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: Érvénytelen import opciók!\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: Érvénytelen import opciók!\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, 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:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem érvényes karakterkiosztás!\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: Érvénytelen export opciók!\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s és %s nem használható együtt!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s értelmetlen %s mellett!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "Érvénytelen alapértelmezett preferenciák!\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, 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:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejtés sikertelen: %s.\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexportálás sikertelen: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Páncél eltávolítása nem sikerült: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti gépelni az üzenetet...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
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:5280
++#: g10/gpg.c:5283
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:5313
++#: g10/gpg.c:5316
#, 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"
@@@ -3791,8 -2984,6 +3791,8 @@@ msgstr "[visszavonás]
msgid "[self-signature]"
msgstr "[önaláírás]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@@ -4604,15 -3635,10 +4604,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5580,26 -4427,22 +5580,26 @@@ msgstr " Kulcs ujjlenyomata =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "Ellenőrzöm a(z) \"%s\" kulcskarikát.\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5607,7 -4450,6 +5607,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:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarikát létrehoztam.\n"
@@@ -5702,7 -4525,6 +5702,7 @@@ msgstr "Lekérem a %08lX kulcsot a %s k
msgid "no keyserver known\n"
msgstr "Érvénytelen export opciók!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
@@@ -6010,125 -4771,90 +6010,112 @@@ msgstr "Olvasási hiba: %s.\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: Elavult opció: \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "FIGYELEM: \"%s\" elavult opció!\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "tömörítetlen"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "tömörítetlen"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Lehet, hogy ez az üzenet használhatatlan a %s számára!\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "ismeretlen aláírásosztály"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "\"%s\" állomány létezik. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Felülírjam (i/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ismeretlen végződés.\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Írja be az új állománynevet"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "Írok a szabványos kimenetre.\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "Azt feltételezem, hogy az aláírt adat a %s állományban van.\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "FIGYELEM: \"%s\" opciói csak a következő futáskor lesznek érvényesek!\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonságos!\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
@@@ -6938,22 -5515,18 +6925,22 @@@ msgstr "Aláírom:
msgid "%s encryption will be used\n"
msgstr "%s titkosítást fogok használni.\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"A kulcs nincs \"nem biztonságosnak\" jelölve,\n"
"nem tudom a pótló véletlenszám-generátorral használni!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"-t kihagytam: másodpéldány.\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "Kihagytam: titkos kulcs már jelen van.\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7042,7 -5599,6 +7029,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:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
@@@ -7185,10 -5713,6 +7172,10 @@@ msgstr "Hiba a jelszó létrehozásakor
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7220,7 -5739,6 +7207,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7249,58 -5763,45 +7236,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Eljárásmód: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "kulcsok listázása"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7308,68 -5809,58 +7291,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "%lu jelszóval rejtjelezve\n"
msgstr[1] "%lu jelszóval rejtjelezve\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
@@@ -7377,149 -5868,123 +7360,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, 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:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "%lu jelszóval rejtjelezve\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Eljárásmód: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7536,18 -6001,14 +7519,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9724,8 -7740,6 +9707,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/id.po
index 5754b45,c2a698f..d3cf21a
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -109,8 -91,6 +109,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "passphrase yang buruk"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -155,95 -127,66 +155,95 @@@ msgstr "MPI yang buruk
msgid "Bad Passphrase"
msgstr "passphrase yang buruk"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "ubah passphrase"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
@@@ -409,10 -321,6 +409,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Kunci dilampaui"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detil"
@@@ -521,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
@@@ -541,36 -417,25 +541,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -617,15 -473,11 +617,15 @@@ msgstr "gagal memperbarui: %s\n
msgid "listening on socket '%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: direktori tercipta\n"
@@@ -665,18 -510,14 +665,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -692,8 -531,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -538,6 +701,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -817,8 -632,6 +817,8 @@@ msgstr "
msgid "Yes"
msgstr "y|ya"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -869,19 -675,16 +869,19 @@@ msgstr "ubah passphrase
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "aktifkan kunci"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1743,8 -1359,6 +1743,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -2040,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
@@@ -2290,8 -1787,6 +2290,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2316,8 -1807,6 +2316,8 @@@ msgstr "kunci %08lX: kunci gaya PGP 2.
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2328,8 -1816,6 +2328,8 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opsi impor tidak valid\n"
@@@ -2365,256 -1845,200 +2365,256 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "No fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "enkripsi data"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "tampilkan kunci"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "ekspor kunci"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "ekspor kunci ke keyserver"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "impor kunci dari keyserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "cari kunci di keyserver"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "impor/gabung kunci"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "perbarui database trust"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "jangan buat perubahan"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2622,7 -2046,6 +2622,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2652,13 -2075,11 +2652,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2673,7 -2094,6 +2673,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2681,550 -2101,434 +2681,550 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Bukan alamat email yang valid\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3793,8 -2986,6 +3793,8 @@@ msgstr "[pembatalan]
msgid "[self-signature]"
msgstr "[self-signature]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -4609,15 -3640,10 +4609,15 @@@ msgstr "
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5584,26 -4431,22 +5584,26 @@@ msgstr " Fingerprint kunci =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "memeriksa keyring `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5611,7 -4454,6 +5611,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 signature yang buruk\n"
msgstr[1] "1 signature yang buruk\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
@@@ -5705,7 -4528,6 +5705,7 @@@ msgstr "meminta kunci %08lX dari %s\n
msgid "no keyserver known\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "melewati `%s': %s\n"
@@@ -6006,123 -4767,89 +6006,111 @@@ msgstr "kesalahan pembacaan: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "silakan gunakan \"%s%s\"\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Tidak dikompresi"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Tidak dikompresi"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "File `%s' ada. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: suffix tidak dikenal\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Masukkan nama file baru"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "menulis ke stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "mengasumsikan data bertanda dalam `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "file konfigurasi baru `%s' tercipta\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@@ -6930,22 -5508,18 +6918,22 @@@ msgstr "menandai:
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
"palsu!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "lewati `%s': terduplikasi\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7034,7 -5592,6 +7022,7 @@@ msgstr "transaksi trustdb terlalu besar
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
@@@ -7177,10 -5706,6 +7165,10 @@@ msgstr "kesalahan penciptaan passphrase
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7212,7 -5732,6 +7200,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7241,58 -5756,45 +7229,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "tampilkan kunci dan ID user"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Kebijakan: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "tampilkan kunci"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [file]|cetak digest pesan"
msgstr[1] "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7300,68 -5802,58 +7284,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "dienkripsi dengan passphrase %lu\n"
msgstr[1] "dienkripsi dengan passphrase %lu\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [file]|cetak digest pesan"
msgstr[1] "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [file]|cetak digest pesan"
msgstr[1] "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [file]|cetak digest pesan"
@@@ -7369,149 -5861,123 +7353,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Menghapus %d signature.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "dienkripsi dengan passphrase %lu\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Kebijakan: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7528,18 -5994,14 +7512,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9715,8 -7732,6 +9699,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/it.po
index b9e9825,7356598..dd853fe
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -104,8 -86,6 +104,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "passphrase errata"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -150,95 -122,66 +150,95 @@@ msgstr "MPI danneggiato
msgid "Bad Passphrase"
msgstr "passphrase errata"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
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:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "cambia la passphrase"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
@@@ -404,10 -316,6 +404,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Questa chiave è stata sostituita"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolisso"
@@@ -516,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -536,36 -412,25 +536,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -612,15 -468,11 +612,15 @@@ msgstr "aggiornamento fallito: %s\n
msgid "listening on socket '%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directory creata\n"
@@@ -660,18 -505,14 +660,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non è disponibile in questa sessione\n"
@@@ -687,8 -526,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -696,9 -533,6 +696,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -812,8 -627,6 +812,8 @@@ msgstr "
msgid "Yes"
msgstr "si|sì"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -864,19 -670,16 +864,19 @@@ msgstr "cambia la passphrase
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "abilita una chiave"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1741,8 -1357,6 +1741,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -2038,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
@@@ -2297,8 -1794,6 +2297,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2323,8 -1814,6 +2323,8 @@@ msgstr "chiave %08lX: chiave in stile P
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non è stato esportato nulla\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2335,8 -1823,6 +2335,8 @@@ msgstr "errore creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opzioni di importazione non valide\n"
@@@ -2372,256 -1852,200 +2372,256 @@@ msgstr "errore creando `%s': %s\n
msgid "No fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "cifra dati"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "elenca le chiavi"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "esporta delle chiavi"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "esporta le chiavi a un keyserver"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importa le chiavi da un keyserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "cerca delle chiavi su un keyserver"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un keyserver"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "non fa cambiamenti"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2629,7 -2053,6 +2629,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2659,13 -2082,11 +2659,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2680,7 -2101,6 +2680,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2688,549 -2108,433 +2688,549 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "L'indirizzo di email non è valido\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non è un set di caratteri valido\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non è permesso usare %s con %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non è valido\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non è valido\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non è valido\n"
@@@ -3802,8 -2995,6 +3802,8 @@@ msgstr "[revoca]
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
@@@ -4617,15 -3648,10 +4617,15 @@@ msgstr "
"corretta\n"
"finchè non eseguirai di nuovo il programma.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5601,26 -4448,22 +5601,26 @@@ msgstr " Impronta digitale =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "controllo il portachiavi `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5628,7 -4471,6 +5628,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "una firma non corretta\n"
msgstr[1] "una firma non corretta\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
@@@ -5722,7 -4545,6 +5722,7 @@@ msgstr "richiedo la chiave %08lX a %s\n
msgid "no keyserver known\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "saltata `%s': %s\n"
@@@ -6025,127 -4786,91 +6025,113 @@@ msgstr "errore di lettura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "usa al suo posto \"%s%s\"\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Non compresso"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Non compresso"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "questo messaggio può non essere utilizzabile da %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Il file `%s' esiste. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: suffisso sconosciuto\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Inserire il nuovo nome del file"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "scrivo su stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "suppongo che i dati firmati siano in `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "creato un nuovo file di configurazione `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
- "esecuzione del programma\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"ATTENZIONE: la chiave di sessione cifrata simmetricamente è potenzialmente\n"
"non sicura\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@@ -6971,22 -5547,18 +6957,22 @@@ msgstr "firma:
msgid "%s encryption will be used\n"
msgstr "sarà usato il cifrario %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la chiave non è indicata come insicura - impossibile usarla con il RNG "
"finto!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "saltata `%s': doppia\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "saltata: chiave pubblica già presente\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7075,7 -5631,6 +7061,7 @@@ msgstr "transazione del trustdb troppo
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
@@@ -7218,10 -5745,6 +7204,10 @@@ msgstr "errore nella creazione della pa
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -7253,7 -5771,6 +7239,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -7282,58 -5795,45 +7268,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "elenca le chiavi e gli user ID"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Policy: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "elenca le chiavi"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [files]|stampa tutti i message digests"
msgstr[1] "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7341,68 -5841,58 +7323,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "cifratto con %lu passphrase\n"
msgstr[1] "cifratto con %lu passphrase\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [files]|stampa tutti i message digests"
msgstr[1] "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [files]|stampa tutti i message digests"
msgstr[1] "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [files]|stampa tutti i message digests"
@@@ -7410,149 -5900,123 +7392,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Cancellate %d firme.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifratto con %lu passphrase\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Policy: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7569,18 -6033,14 +7551,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9758,8 -7773,6 +9740,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/ja.po
index b581013,97ac30b..ea49b6c
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,10 -8,9 +8,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 2.1.16\n"
+ "Project-Id-Version: gnupg 2.1.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
- "PO-Revision-Date: 2016-12-17 16:29+0900\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\n"
+ "PO-Revision-Date: 2017-04-04 10:45+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
"Language: ja\n"
@@@ -108,8 -90,6 +108,8 @@@ msgstr "PIN:
msgid "Passphrase:"
msgstr "パスフレーズ:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "一致しません - もう一度"
@@@ -149,61 -121,38 +149,61 @@@ msgstr "不正なPINです
msgid "Bad Passphrase"
msgstr "パスフレーズが不正です"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "カード・シリアル番号の取得エラー: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "カードを検出しました。シリアル番号: %s\n"
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "適当なカードの鍵が見つかりません: %s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "カードのリスト の取得エラー: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -212,24 -161,19 +212,24 @@@ msgstr "
"sshプロセスが以下の鍵の使用を要求しました:%%0A %s%%0A (%s)%%0Aこの使用を認"
"めますか?"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "許可する"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "拒否する"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "このパスフレーズをもう一度入力してください"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -238,7 -182,6 +238,7 @@@ msgstr "
"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A %s"
"%%0A %s%%0Aを保護します。"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
@@@ -391,10 -303,6 +391,10 @@@ msgstr "サーバ・モードで実行
msgid "run in supervised mode"
msgstr "スーパーバイズド・モードで実行"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "冗長"
@@@ -492,11 -375,6 +492,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
@@@ -512,33 -388,22 +512,33 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
@@@ -582,14 -438,10 +582,14 @@@ msgstr "listen() に失敗しました
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "ディレクトリ'%s'が作成できません: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "ディレクトリ'%s'が作成されました\n"
@@@ -629,18 -474,14 +629,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -656,8 -495,6 +656,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -665,9 -502,6 +665,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -782,8 -597,6 +782,8 @@@ msgstr "究極的にこれを信用し%
msgid "Yes"
msgstr "はい"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "いいえ"
@@@ -837,18 -643,15 +837,18 @@@ msgstr "パスフレーズを変更す�
msgid "I'll change it later"
msgstr "後で変更する"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "鍵を削除する"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1646,8 -1262,6 +1646,8 @@@ msgstr "エラー: URLが長すぎま�
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
@@@ -1924,22 -1474,14 +1924,22 @@@ msgstr "無効なコマンド (\"help\"
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:246 g10/gpg.c:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
@@@ -2156,8 -1653,6 +2156,8 @@@ msgstr "GnuPGの鍵のバックアッ�
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
@@@ -2180,8 -1671,6 +2180,8 @@@ msgstr "鍵%s: PGP 2.x形式の鍵で�
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2190,8 -1678,6 +2190,8 @@@
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(オプション'%s'の引数を確認ください)\n"
@@@ -2225,233 -1705,177 +2225,233 @@@ msgstr "'%s'を %s から取得する�
msgid "No fingerprint"
msgstr "フィンガープリントがありません"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "'%s'に渡されたすべての値は無視されました\n"
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "署名を作成"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "データを暗号化"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "鍵の一覧"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "鍵と署名の一覧"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "すばやく新しい鍵ペアを生成"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "すばやく新しいユーザIDを追加"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
msgstr "すばやくユーザIDを失効"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly set a new expiration date"
msgstr "すばやく新しい有効期限を設定"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "全機能の鍵ペアを生成"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "鍵にすばやく署名"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "鍵へすばやくローカルに署名"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "鍵に署名"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "鍵へローカルに署名"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "パスフレーズの変更"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "鍵をエクスポートする"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "鍵サーバに鍵をエクスポートする"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "鍵サーバから鍵をインポートする"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "鍵サーバの鍵を検索する"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "鍵サーバから鍵を全部更新する"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "鍵のインポート/マージ"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "カード・ステイタスを表示"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "カードのデータを変更"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "カードのPINを変更"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "信用データベースを更新"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "サーバ・モードで実行"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|TOFUポリシーを鍵に設定する"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "無変更"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "上書き前に確認"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2459,7 -1883,6 +2459,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
msgid ""
"@\n"
"Examples:\n"
@@@ -2479,11 -1902,9 +2479,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2493,7 -1914,6 +2493,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2501,527 -1921,411 +2501,527 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, c-format
msgid "valid values for option '%s':\n"
msgstr "オプション'%s'に有効な値:\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "不明のTOFUポリシー'%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, c-format
msgid "invalid value for option '%s'\n"
msgstr "オプション'%s'に無効な値です\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\"は正しいメール・アドレスではありません\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, c-format
msgid "invalid filter option: %s\n"
msgstr "無効なフィルタ・オプションです: %s\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
- msgstr "署名の検証時に主なユーザIDだけをを表示する"
+ msgstr "署名の検証時にプライマリ・ユーザIDだけをを表示する"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "鍵指定'%s'の構文解析エラー: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, 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:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
"警告: コマンドが指定されていません。なにを意味しているのか当ててみます ...\n"
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
@@@ -3574,8 -2767,6 +3574,8 @@@ msgstr "[失効]
msgid "[self-signature]"
msgstr "[自己署名]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "メモリの確保のエラー: %s\n"
@@@ -4182,25 -3242,17 +4182,21 @@@ msgstr "更新に失敗しました: %s
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
+#: g10/keyedit.c:3046
- #, fuzzy
- #| msgid "You can't delete the last user ID!\n"
msgid "cannot revoke the last valid user ID.\n"
- msgstr "最後のユーザIDは削除できません!\n"
+ msgstr "最後の有効なユーザIDは失効できません。\n"
+#: g10/keyedit.c:3072
- #, fuzzy, c-format
- #| msgid "checking the trust list failed: %s\n"
+ #, c-format
msgid "revoking the user ID failed: %s\n"
- msgstr "信用リストの検査に失敗しました: %s\n"
+ msgstr "ユーザIDの失効に失敗しました: %s\n"
+#: g10/keyedit.c:3136
- #, fuzzy, c-format
- #| msgid "checking the trust list failed: %s\n"
+ #, c-format
msgid "setting the primary user ID failed: %s\n"
- msgstr "信用リストの検査に失敗しました: %s\n"
+ msgstr "プライマリ・ユーザIDの設定に失敗しました: %s\n"
+#: g10/keyedit.c:3167
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
@@@ -4318,14 -3345,9 +4314,14 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "失効"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "期限切れ"
@@@ -4606,13 -3569,9 +4602,11 @@@ msgstr "ユーザID\"%s\"は、もう�
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
+#: g10/keyedit.c:6558
- #, fuzzy
- #| msgid "You can't delete the last user ID!\n"
msgid "Cannot revoke the last valid user ID.\n"
- msgstr "最後のユーザIDは削除できません!\n"
+ msgstr "最後の有効なユーザIDは失効できません。\n"
+#: g10/keyedit.c:6596
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "鍵 %s は、もう失効されています。\n"
@@@ -5236,30 -4077,25 +5230,30 @@@ msgstr " フィンガープリント
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "鍵リング'%s'をキャッシュします\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "%lu個の鍵をキャッシュしました"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu個の不正な署名)\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鍵リングができました\n"
@@@ -5348,7 -4165,6 +5342,7 @@@ msgstr "鍵%sを%sに要求\n
msgid "no keyserver known\n"
msgstr "鍵サーバがわかりません\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\"をスキップしました: %s\n"
@@@ -5638,34 -4393,28 +5632,34 @@@ msgstr "(報告されたエラー: %s <
msgid "(further info: "
msgstr "(より詳細な情報: "
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 廃止されたオプション\"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "\"%s%s\"を代わりに使ってください\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: \"%s\"は、このファイルで使われなくなりました - %sになんの効果もありま"
"せん\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5673,86 -4422,60 +5667,76 @@@ msgstr "
"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
"ません\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "無圧縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "無圧縮|なし"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "このメッセージは、%sでは使用できません\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "あいまいなオプション'%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "不明のオプション'%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "不明の弱いダイジェスト'%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "ファイル'%s'は既に存在します。"
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "上書きしますか? (y/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: 不明の拡張子\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "新しいファイル名を入力してください"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "標準出力に書き込みます\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "署名されたデータが'%s'にあると想定します\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "新しいコンフィグレーション・ファイル'%s'ができました\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "*警告*: '%s'のオプションはこの実行では、まだ有効になりません\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "公開鍵のアルゴリズム%dは、取り扱えません\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "*警告*: 潜在的にセキュアでない共通鍵暗号化セッション鍵です\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
@@@ -6522,22 -5096,18 +6506,22 @@@ msgstr "署名:
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"セキュアでないというフラグが鍵には設定されていません。\n"
"偽物乱数生成器とはいっしょに使えません!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"をスキップします: 重複\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "スキップ: 秘密鍵はもうあります\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
@@@ -6620,7 -5174,6 +6604,7 @@@ msgstr "信用データベースのト�
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "'%s'にアクセスできません: %s\n"
@@@ -6758,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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "TOFUデータベースの読み込みエラー: %s\n"
@@@ -6791,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "TOFUデータベースの更新エラー: %s\n"
@@@ -6822,110 -5333,87 +6806,106 @@@ msgstr "
"この電子メールアドレスが鍵 %s に結びつけられるべきか、あるいは誰かが\"%s\" に"
"なりすましていると思うか指定してください。"
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ほかのユーザIDの収集エラー: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
msgid "This key's user IDs:\n"
msgstr "この鍵のユーザID:\n"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, c-format
msgid "policy: %s"
msgstr "ポリシー: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "署名の統計の収集エラー: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ", "
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
msgid "this key"
msgstr "この鍵"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "%d個のメッセージを検証しました。"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "%d個のメッセージを暗号化しました。"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "%d個のメッセージが未来に検証されました。"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "%d個のメッセージが未来に暗号化されました。"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] "過去%d日間に検証されたメッセージの数: %d."
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] "過去%d日間に暗号化されたメッセージの数: %d."
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] "過去%d月の間に検証されたメッセージの数: %d."
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] "過去%d月の間に暗号化されたメッセージの数: %d."
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] "過去%d年間に検証されたメッセージの数: %d."
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] "過去%d年間に暗号化されたメッセージの数: %d."
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr "これまでに検証されたメッセージの数: %d."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "これまでに暗号化されたメッセージの数: %d."
@@@ -6933,138 -5421,112 +6913,138 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr "TOFUはバインディングの衝突を検出しました"
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
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
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr "不明をデフォルトとします。\n"
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr "TOFU dbが壊れていることが検出されました。\n"
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, c-format
msgid "resetting keydb: %s\n"
msgstr "keydbをリセット: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "TOFUバインディングのポリシーを %s に設定エラー\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "TOFUポリシーの作成エラー: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] "%lld年"
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] "%lld月"
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] "%lld週"
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] "%lld日"
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] "%lld時間"
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] "%lld分"
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] "%lld秒"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: 0個の署名を検証、0個のメッセージを暗号化しました。"
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: 0個の署名を検証しました。"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
msgid "Encrypted 0 messages."
msgstr "0 個のメッセージを暗号化しました。"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, c-format
msgid "(policy: %s)"
msgstr "(ポリシー: %s)"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度も見てません!\n"
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr "警告: この鍵とユーザIDで署名されたメッセージは一度しか見てません!\n"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr "警告: この鍵へは一つもメッセージを暗号化したことがありません!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr "警告: この鍵へは一つのメッセージしか暗号化したことがありません!\n"
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7085,19 -5547,15 +7065,19 @@@ msgstr[0] "
" %s\n"
"でダメとマークしてください。\n"
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "TOFUデータベースのオープンでエラー: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです\n"
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr "鍵%s, ユーザID \"%s\"のポリシーの設定エラー: %s"
@@@ -9197,8 -7210,6 +9177,8 @@@ msgstr "\"http\" を \"https\" の代�
msgid "CRL access not possible due to disabled %s\n"
msgstr "CRLアクセスは停止された%sのため不可能です\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
#, c-format
msgid "error initializing reader object: %s\n"
msgstr "リーダ・オブジェクトの初期化エラー: %s\n"
diff --cc po/nb.po
index a0866ae,9de4f45..eca86ae
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -112,8 -94,6 +112,8 @@@ msgstr "PIN:
msgid "Passphrase:"
msgstr "Passordfrase:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "feil. Prøv igjen"
@@@ -153,62 -125,39 +153,62 @@@ msgstr "Ugyldig PIN
msgid "Bad Passphrase"
msgstr "Ugyldig passordfrase"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "klarte ikke å lage «%s»: %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "klarte ikke å åpne «%s»: %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "feil under henting av kort-serienummer: %s\n"
- #: agent/command-ssh.c:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -217,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Tillat"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Avvis"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Skriv inn denne passordfrasen på nytt"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -243,7 -187,6 +243,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke å lage strøm av sokkel: %s\n"
@@@ -398,10 -310,6 +398,10 @@@ msgstr "kjør i tjenermodus (forgrunn)
msgid "run in supervised mode"
msgstr "kjør i tjenermodus"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detaljert utskrift"
@@@ -499,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter programfeil til <@EMAIL@>.\n"
@@@ -519,33 -395,22 +519,33 @@@ msgstr "
"Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
"Håndtering av hemmelige nøkler for @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "valgfil «%s»: %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "leser valg fra «%s»\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Merk: «%s» regnes ikke som et valg\n"
@@@ -589,14 -445,10 +589,14 @@@ msgstr "listen() mislyktes: %s\n
msgid "listening on socket '%s'\n"
msgstr "lytter på sokkel «%s»\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "klarte ikke å lage mappa «%s»: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "mappa «%s» er opprettet\n"
@@@ -636,18 -481,14 +636,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect mislyktes: %s - venter 1s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kjører i gjeldende økt\n"
@@@ -663,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -672,9 -509,6 +672,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -789,8 -604,6 +789,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Nei"
@@@ -843,7 -649,6 +843,7 @@@ msgstr "Endre passordfrase
msgid "I'll change it later"
msgstr "Jeg endrer senere"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -851,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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Slett nøkkel"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1656,8 -1272,6 +1656,8 @@@ msgstr "Feil: Adressen er for lang (gre
msgid "error reading '%s': %s\n"
msgstr "feil under lesing av «%s»: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "feil under skriving av «%s»: %s\n"
@@@ -1934,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "klarte ikke å åpne «%s»\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "fant ikke nøkkelen «%s»: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "feil under lesing av nøkkelblokk: %s\n"
@@@ -2171,8 -1668,6 +2171,8 @@@ msgstr "
msgid " - skipped"
msgstr ". Hoppet over"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "skriver til «%s»\n"
@@@ -2195,8 -1686,6 +2195,8 @@@ msgstr "nøkkel %s: PGP 2.x-aktig nøkk
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2205,8 -1693,6 +2205,8 @@@
msgid "[User ID not found]"
msgstr "[Fant ikke bruker-ID]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(kontroller argument for valget «%s»)\n"
@@@ -2240,235 -1720,179 +2240,235 @@@ msgstr "feil under henting av «%s» vi
msgid "No fingerprint"
msgstr "Ingen fingeravtrykk"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "alle verdier som sendes til «%s» blir ignorert\n"
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "lag signatur"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "lag klartekst-signatur"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "lag adskilt signatur"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "krypter data (symmetrisk)"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dekrypter data (forvalgt)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "bekreft signatur"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "vis nøkler"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "vis nøkler og signaturer"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "vis og kontroller nøkkelsignaturer"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "vis nøkler og fingeravtrykk"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "vis hemmelige nøkler"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "lag nytt nøkkelpar"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "legg til en ny bruker-ID raskt"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
msgstr "opphev bruker-ID raskt"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "fullverdig generering av nøkkelpar"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "lag opphevelsessertifikat"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "fjern nøkler fra offentlig nøkkelknippe"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "fjern nøkler fra hemmelig nøkkelknippe"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "hurtigsigner nøkkel"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "hurtigsigner nøkkel lokalt"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "signer nøkkel"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "signer nøkkel lokalt"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "signer eller rediger nøkkel"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "endre passordfrase"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "eksporter nøkler"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "eksporter nøkler til nøkkeltjener"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importer nøkler fra nøkkeltjener"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "søk etter nøkler på nøkkeltjener"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "oppdater alle nøkler fra nøkkeltjener"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importer/slå sammen nøkler"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "vis kortstatus"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "endre data på kort"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "endre PIN på kort"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "oppdater tillitsdatabase"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "skriv ut kontrollsum av melding"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "kjør i tjenermodus"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VERDI|endre TOFU-regler for nøkkel"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "lag ASCII-beskyttet utdata"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv utdata til valgt FIL"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "ikke utfør valgte endringer"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "spør før overskriving"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppførsel"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2476,7 -1900,6 +2476,7 @@@ msgstr "
"@\n"
"(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2506,11 -1929,9 +2506,11 @@@ msgstr "
" --list-keys [navn] vis nøkler\n"
" --fingerprint [navn] vis fingeravtrykk\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2520,7 -1941,6 +2520,7 @@@ msgstr "
"Signer, kontroller, krypter eller dekrypter.\n"
"Forvalgt handling avhenger av inndata.\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2528,530 -1948,414 +2528,530 @@@ msgstr "
"\n"
"Støttede algoritmer:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Off. nøkkel: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Kryptering: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "bruk: %s [valg] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "oppsettselementet «%s» er ukjent\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "vis foto-id-er i nøkkelvisning"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "vis regeladresser i signaturvisning"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "vis alle notater i signaturvisning"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotater under signaturvisning"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "vis brukervalgte notater under signaturvisning"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "vis nøkkelknippe-navn i nøkkelvisning"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "vis utløpsdatoer i nøkkelvisning"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "«%s» er et ukjent TOFU-regelverk\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(bruk «help» for å vise valg)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» er en ugyldig signatur-utløpstid\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» er ikke et gyldig tegnsett\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importeringsvalg\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "ugyldige importeringsvalg\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, c-format
msgid "invalid filter option: %s\n"
msgstr "filtervalget %s er ugyldig\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "vis bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "vis adresser til retningslinjer under signaturbekreftelse"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "vis alle merknader under signaturbekreftelse"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotater under signaturbekreftelse"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "vis selvvalgte merknader under signaturbekreftelse"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "kontroller signaturer som har PKA-data"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige kontrollvalg\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "ugyldige kontrollvalg\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "klarte ikke å endre «exec»-sti til %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "du kan ikke bruke %s med %s.\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s gir ikke mening med %s.\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kjører med falsk systemtid: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "«completes-needed» må være større enn 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "«marginals-needed» må være større enn 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "ugyldig standardoppsett\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enda med %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "nøkkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "søk på nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "«%s» er en ugyldig summeringsalgoritme\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, 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:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Skriv inn melding …\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "valgt adresse for signaturregler er ugyldig\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@@ -3614,8 -2807,6 +3614,8 @@@ msgstr "[oppheving]
msgid "[self-signature]"
msgstr "[selvsignatur]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "feil under minnetildeling: %s\n"
@@@ -4378,14 -3409,9 +4378,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "opphevet"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "utgått"
@@@ -5316,33 -4163,28 +5316,33 @@@ msgstr " Nøkkelfingeravtrykk =
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "hurtiglagrer nøkkelknippe «%s»\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, 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:1554
++#: g10/keyring.c:1559
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu signatur)\n"
msgstr[1] " (%lu signaturer)\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: laget nøkkelknippe\n"
@@@ -5432,7 -4255,6 +5432,7 @@@ msgstr "ber om nøkkelen %s fra %s\n
msgid "no keyserver known\n"
msgstr "ingen kjent nøkkeltjener\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppet over «%s»: %s\n"
@@@ -5724,118 -4485,86 +5724,108 @@@ msgstr "(rapportert feil: %s <%s>)\n
msgid "(further info: "
msgstr "(mer info: "
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: valget «%s» er utgått\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: valget «%s» er utgått\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "bruk heller «%s%s»\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "ADVARSEL: «%s» er en utgått kommando. Ikke bruk den\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: «%s» er utgått i denne fila, og påvirker bare %s\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "ADVARSEL: valget «%s%s» er utgått, og påvirker bare %s\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Ukomprimert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "ukomprimert|ingen"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "denne meldinga kan kanskje ikke brukes av %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "«%s» er et flertydig valg\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "«%s» er et ukjent valg\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Offentlig ECDSA-nøkler forventes i SEC-koding som kan ganges med 8 bit\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "«%s» er en ukjent svak summeringsmetode\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Fila «%s» finnes. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Overskrive (j/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ukjent suffiks\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Skriv inn nytt filnavn"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "skriver til stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "antar signert data i «%s»\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "ny oppsettsfil «%s» opprettet\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "ADVARSEL: valgene i «%s» trer ikke i kraft for gjeldende programøkt\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "klarte ikke å håndtere offentlig nøkkelalgoritme %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ADVARSEL: det er usikkert å kryptere øktnøkkel symmetrisk\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke %d er merket som kritisk\n"
@@@ -6638,20 -5218,16 +6628,20 @@@ msgstr "signerer:
msgid "%s encryption will be used\n"
msgstr "bruker %s-kryptering\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "nøkkel er ikke merket som usikker, og kan ikke brukes med falsk RNG.\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppet over «%s»: er duplikat\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "hoppet over, fordi hemmelig nøkkel allerede er tilstede\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
@@@ -6735,7 -5295,6 +6725,7 @@@ msgstr "trustdb-transaksjon er for stor
msgid "%s: directory does not exist!\n"
msgstr "%s: mappa finnes ikke.\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "fikk ikke tilgang til «%s»: %s\n"
@@@ -6874,10 -5405,6 +6864,10 @@@ msgstr "feil under oppretting av midler
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "feil under lesing av TOFU-database: %s\n"
@@@ -6908,7 -5430,6 +6898,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "feil under oppdatering av TOFU-database: %s\n"
@@@ -6947,48 -5464,36 +6937,44 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "feil under henting av andre bruker-id-er: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "vis nøkler og bruker-id-er"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, c-format
msgid "policy: %s"
msgstr "regelverk: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "feil under henting av signaturstatistikk: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
msgid "this key"
msgstr "denne nøkkelen"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "Verified %ld messages signed by \"%s\"."
msgid "Verified %d message."
@@@ -6996,7 -5501,6 +6982,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "Bekreftet %ld meldinger signert av «%s»."
msgstr[1] "Bekreftet %ld meldinger signert av «%s»."
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7004,7 -5508,6 +6990,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "kryptert med %lu passordfraser\n"
msgstr[1] "kryptert med %lu passordfraser\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7013,7 -5516,6 +6999,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "%ld melding signert i fremtid."
msgstr[1] "%ld meldinger signert i fremtid."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "%ld message signed in the future."
#| msgid_plural "%ld messages signed in the future."
@@@ -7022,7 -5524,6 +7008,7 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "%ld melding signert i fremtid."
msgstr[1] "%ld meldinger signert i fremtid."
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7031,7 -5532,6 +7017,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " i løpet av gårsdagen (%ld)."
msgstr[1] " i løpet av de %ld siste dagene."
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7040,7 -5540,6 +7026,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " i løpet av gårsdagen (%ld)."
msgstr[1] " i løpet av de %ld siste dagene."
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7049,7 -5548,6 +7035,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " i løpet av den siste måneden (%ld)."
msgstr[1] " i løpet av de siste %ld månedene."
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, fuzzy, c-format
#| msgid " over the past %ld month."
#| msgid_plural " over the past %ld months."
@@@ -7058,7 -5556,6 +7044,7 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " i løpet av den siste måneden (%ld)."
msgstr[1] " i løpet av de siste %ld månedene."
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7067,7 -5564,6 +7053,7 @@@ msgid_plural "Messages verified over th
msgstr[0] " i løpet av gårsdagen (%ld)."
msgstr[1] " i løpet av de %ld siste dagene."
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
@@@ -7076,14 -5572,12 +7062,14 @@@ msgid_plural "Messages encrypted over t
msgstr[0] " i løpet av gårsdagen (%ld)."
msgstr[1] " i løpet av de %ld siste dagene."
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, fuzzy, c-format
#| msgid " over the past %ld day."
#| msgid_plural " over the past %ld days."
msgid "Messages verified in the past: %d."
msgstr " i løpet av gårsdagen (%ld)."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7099,47 -5593,38 +7085,47 @@@ msgstr "
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr "TOFU oppdaget en tilknytningskonflikt"
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr "gGaAuUnNdD"
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
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
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "feil under skriving av nøkkel: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "feil under endring av TOFU-regler: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, fuzzy, c-format
#| msgid "%d~year"
#| msgid_plural "%d~years"
@@@ -7148,7 -5633,6 +7134,7 @@@ msgid_plural "%lld~years
msgstr[0] "%d~år"
msgstr[1] "%d~år"
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, fuzzy, c-format
#| msgid "%d~month"
#| msgid_plural "%d~months"
@@@ -7157,14 -5641,12 +7143,14 @@@ msgid_plural "%lld~months
msgstr[0] "%d~måned"
msgstr[1] "%d~måneder"
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, fuzzy, c-format
#| msgid "%d~day"
#| msgid_plural "%d~days"
@@@ -7173,7 -5655,6 +7159,7 @@@ msgid_plural "%lld~days
msgstr[0] "%d~dag"
msgstr[1] "%d~dager"
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, fuzzy, c-format
#| msgid "%d~hour"
#| msgid_plural "%d~hours"
@@@ -7182,7 -5663,6 +7168,7 @@@ msgid_plural "%lld~hours
msgstr[0] "%d~time"
msgstr[1] "%d~timer"
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, fuzzy, c-format
#| msgid "%d~minute"
#| msgid_plural "%d~minutes"
@@@ -7191,7 -5671,6 +7177,7 @@@ msgid_plural "%lld~minutes
msgstr[0] "%d~minutt"
msgstr[1] "%d~minutter"
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, fuzzy, c-format
#| msgid "%d~second"
#| msgid_plural "%d~seconds"
@@@ -7200,20 -5679,17 +7186,20 @@@ msgid_plural "%lld~seconds
msgstr[0] "%d~sekund"
msgstr[1] "%d~sekunder"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, 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:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Slettet %d signaturer.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7230,13 -5706,11 +7216,13 @@@ msgstr[1] "
"Bekreftet %ld meldinger signert av «%s»\n"
"siste %s."
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "kryptert med %lu passordfraser\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid ""
#| "Verified %ld message signed by \"%s\"\n"
@@@ -7253,13 -5727,11 +7239,13 @@@ msgstr[1] "
"Bekreftet %ld meldinger signert av «%s»\n"
"siste %s."
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "policy: %s"
msgid "(policy: %s)"
msgstr "regelverk: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
#, fuzzy
#| msgid "Warning: we've have yet to see a message signed by this key!\n"
msgid ""
@@@ -7268,7 -5740,6 +7254,7 @@@ msgstr "
"Advarsel: vi har enda ikke sett en melding som er signert av denne "
"nøkkelen.\n"
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
#, fuzzy
#| msgid "Warning: we've only seen a single message signed by this key!\n"
msgid ""
@@@ -7276,7 -5747,6 +7262,7 @@@
msgstr ""
"Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
#, 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"
@@@ -7284,14 -5754,12 +7270,14 @@@ msgstr "
"Advarsel: vi har enda ikke sett en melding som er signert av denne "
"nøkkelen.\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
#, 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:3253
++#: g10/tofu.c:3260
#, fuzzy, c-format
#| msgid ""
#| "Warning: if you think you've seen more than %ld message signed by this "
@@@ -7330,18 -5798,14 +7316,18 @@@ msgstr[1] "
"Bruk %s \n"
"for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\n"
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "feil under åpning av TOFU-database: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9453,8 -7472,6 +9439,8 @@@ msgstr "bruker «http» i stedet for «
msgid "CRL access not possible due to disabled %s\n"
msgstr "Ingen CRL-tilgang fordi %s er slått av\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/pl.po
index 35e61cd,beb85e5..0be86e4
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-2.0.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -116,8 -98,6 +116,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Hasło:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "nie pasują - proszę spróbować jeszcze raz"
@@@ -157,65 -129,42 +157,65 @@@ msgstr "Niepoprawny PIN
msgid "Bad Passphrase"
msgstr "Niepoprawne hasło"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "błąd pobierania numeru seryjnego karty: %s\n"
- #: agent/command-ssh.c:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -223,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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Zgoda"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Odmowa"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Proszę ponownie wprowadzić to hasło"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -249,7 -193,6 +249,7 @@@ msgstr "
"Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A %s"
"%%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
@@@ -432,10 -344,6 +432,10 @@@ msgstr "uruchomienie w trybie serwera (
msgid "run in supervised mode"
msgstr "uruchomienie w trybie serwera"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "z dodatkowymi informacjami"
@@@ -539,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Błędy prosimy zgłaszać na adres <@EMAIL@>.\n"
@@@ -565,37 -441,26 +565,37 @@@ msgstr "
"Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarządzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, 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:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -644,15 -500,11 +644,15 @@@ msgstr "listen() nie powiodło się: %s
msgid "listening on socket '%s'\n"
msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -695,19 -540,15 +695,19 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "brak działającego gpg-agenta w tej sesji\n"
@@@ -724,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -570,6 +733,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -857,8 -672,6 +857,8 @@@ msgstr "
msgid "Yes"
msgstr "Tak"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Nie"
@@@ -911,7 -717,6 +911,7 @@@ msgstr "Zmiana hasła
msgid "I'll change it later"
msgstr "Zmienię je później"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -919,13 -724,11 +919,13 @@@
"%%0A?"
msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "włączenie klucza do użycia"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1764,8 -1380,6 +1764,8 @@@ msgstr "Błąd: URL zbyt długi (limit
msgid "error reading '%s': %s\n"
msgstr "błąd odczytu ,,%s'': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -2061,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "błąd odczytu bloku kluczy: %s\n"
@@@ -2311,8 -1808,6 +2311,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: pominięty: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2336,8 -1827,6 +2336,8 @@@ msgstr "klucz %s: klucz PGP 2.x - pomin
msgid "WARNING: nothing exported\n"
msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2347,8 -1835,6 +2347,8 @@@ msgstr "błąd tworzenia ,,%s'': %s\n
msgid "[User ID not found]"
msgstr "[brak identyfikatora użytkownika]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2387,250 -1867,194 +2387,250 @@@ msgstr "błąd odtwarzania ,,%s'' poprz
msgid "No fingerprint"
msgstr "Brak odcisku"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Opcja --allow-non-selfsigned-uid wymusiła uznanie za poprawny klucza %s.\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "złożenie podpisu"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "złożenie podpisu pod dokumentem"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "złożenie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "szyfrowanie danych"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domyślne)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "lista kluczy"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "lista kluczy i podpisów"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpisów kluczy"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisków"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu unieważnienia klucza"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "usunięcie klucza ze zbioru kluczy publicznych"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "złożenie podpisu na kluczu"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "złożenie prywatnego podpisu na kluczu"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "złożenie podpisu na kluczu"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "złożenie prywatnego podpisu na kluczu"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "zmiana hasła"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "eksport kluczy do pliku"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "eksport kluczy do serwera kluczy"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "szukanie kluczy na serwerze"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "odświeżenie wszystkich kluczy z serwera"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "import/dołączenie kluczy"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "wyświetlenie stanu karty"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "zmiana danych na karcie"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "wypisanie skrótów wiadomości"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
"odszyfrowania"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyjścia do PLIKU"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plików"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "ścisłe zachowanie OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2638,7 -2062,6 +2638,7 @@@ msgstr "
"@\n"
"(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2670,13 -2093,11 +2670,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisków kluczy\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2691,7 -2112,6 +2691,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
"Domyślnie wykonywana operacja zależy od danych wejściowych\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2699,78 -2119,64 +2699,78 @@@ msgstr "
"\n"
"Obsługiwane algorytmy:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Skrótów: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "wywołanie: gpgsm [opcje]"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu domowego ,,%s''\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa własności do pliku konfiguracyjnego ,,%s''\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "OSTRZEŻENIE: niebezpieczne prawa własności do rozszerzenia ,,%s''\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracyjnego ,,%s''\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2778,7 -2184,6 +2778,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2788,7 -2193,6 +2788,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2796,7 -2200,6 +2796,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2804,7 -2207,6 +2804,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2815,7 -2217,6 +2815,7 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2823,461 -2224,364 +2823,461 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "niezrozumiały URL serwera kluczy\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
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:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpisów z danymi PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno używać %s z %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w połączeniu z %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "wartość completes-needed musi być większa od 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "wartość marginals-needed musi być większa od 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "niewłaściwe domyślne ustawienia\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "niewłaściwe ustawienia szyfrów\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "niewłaściwe ustawienia skrótów\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie działa z %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoją wiadomość ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@@ -3858,8 -3051,6 +3858,8 @@@ msgstr "[unieważnienie]
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@@ -4666,14 -3697,9 +4666,14 @@@ msgstr "
"Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
"dopóki program nie zostanie uruchomiony ponownie.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "unieważniony"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "wygasł"
@@@ -5645,13 -4492,11 +5645,13 @@@ msgstr " Odcisk klucza =
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "buforowanie zbioru kluczy ,,%s''\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5660,7 -4505,6 +5660,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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5668,7 -4512,6 +5668,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5677,7 -4520,6 +5677,7 @@@ msgstr[0] "1 niepoprawny podpis\n
msgstr[1] "1 niepoprawny podpis\n"
msgstr[2] "1 niepoprawny podpis\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: zbiór kluczy utworzony\n"
@@@ -5771,7 -4594,6 +5771,7 @@@ msgstr "zapytanie o klucz %s z %s\n
msgid "no keyserver known\n"
msgstr "brak akcji serwera kluczy!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "pominięty ,,%s'': %s\n"
@@@ -6076,131 -4837,97 +6076,119 @@@ msgstr "błąd odczytu w ,,%s'': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d jest przestarzałą opcją ,,%s''\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "w jej miejsce należy użyć ,,%s%s''\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"OSTRZEŻENIE: ,,%s'' jest przestarzałym poleceniem - nie należy go używać\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: przestarzała opcja ,,%s'' - nie ma efektu\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Nieskompresowany"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "nieskompresowany|brak"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ta wiadomość może nie dać się odczytać za pomocą %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "niejednoznaczna opcja ,,%s''\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA wymaga długości skrótu będącego wielokrotnością 8 bitów\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Nieznany rodzaj podpisu ,,%s''\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Plik ,,%s'' już istnieje. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Nadpisać? (t/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: nieznana końcówka nazwy\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Nazwa pliku"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "zapisywanie na wyjście standardowe\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "przyjęto obecność podpisanych danych w '%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "nowy plik ustawień ,,%s'' został utworzony\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "OSTRZEŻENIE: opcje w ,,%s'' nie są jeszcze uwzględnione.\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nie można obsłużyć tego algorytmu klucza publicznego: %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"OSTRZEŻENIE: symetrycznie zaszyfrowany klucz sesyjny może nie być "
"bezpieczny\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@@ -7042,22 -5620,18 +7030,22 @@@ msgstr "podpis:
msgid "%s encryption will be used\n"
msgstr "zostanie użyty szyfr %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klucz nie jest oznaczony jako niepewny - nie można go użyć z atrapą\n"
"generatora liczb losowych!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "pominięty ,,%s'': duplikat\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "pominięty: klucz prywatny jest już wpisany\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniający "
@@@ -7147,7 -5705,6 +7135,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:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7291,10 -5820,6 +7279,10 @@@ msgstr "błąd tworzenia pliku tymczaso
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7329,7 -5849,6 +7317,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7360,31 -5875,26 +7348,31 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista kluczy i identyfikatorów użytkownika"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "poprawność: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "błąd pobierania zapisanych flag: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, 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"
@@@ -7392,22 -5902,15 +7380,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista kluczy"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7416,7 -5919,6 +7400,7 @@@ 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:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7425,7 -5927,6 +7409,7 @@@ msgstr[0] "zaszyfrowane za pomocą %lu
msgstr[1] "zaszyfrowane za pomocą %lu haseł\n"
msgstr[2] "zaszyfrowane za pomocą %lu haseł\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7434,7 -5935,6 +7418,7 @@@ 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:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7443,7 -5943,6 +7427,7 @@@ 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:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7451,7 -5950,6 +7435,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7459,7 -5957,6 +7443,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7467,7 -5964,6 +7451,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7475,7 -5971,6 +7459,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7483,7 -5978,6 +7467,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7491,12 -5985,10 +7475,12 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7505,48 -5997,39 +7489,48 @@@ msgstr "wypisanie skrótów wiadomości
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "błąd zapisu klucza: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7554,7 -6037,6 +7538,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7562,7 -6044,6 +7546,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7570,7 -6051,6 +7554,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7578,7 -6058,6 +7562,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7586,7 -6065,6 +7570,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7594,7 -6072,6 +7578,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7602,18 -6079,15 +7586,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d podpisów usuniętych.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7622,13 -6096,11 +7606,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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zaszyfrowane za pomocą %lu haseł\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7637,31 -6109,25 +7621,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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "poprawność: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7679,19 -6145,15 +7663,19 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9957,8 -7974,6 +9941,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/pt.po
index 0666dc0,d446cdc..c194648
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -107,8 -89,6 +107,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -153,95 -125,66 +153,95 @@@ msgstr "MPI incorreto
msgid "Bad Passphrase"
msgstr "frase secreta incorrecta"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de protecção %d%s não é suportado\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "muda a frase secreta"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de dispersão: %s\n"
@@@ -407,10 -319,6 +407,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "A chave foi substituída"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detalhado"
@@@ -521,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -541,36 -417,25 +541,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -617,14 -473,10 +617,14 @@@ msgstr "actualização falhou: %s\n
msgid "listening on socket '%s'\n"
msgstr "a escrever chave privada para `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
msgid "can't create directory '%s': %s\n"
msgstr "%s: impossível criar directoria: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directoria criada\n"
@@@ -664,18 -509,14 +664,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualização da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent não está disponível nesta sessão\n"
@@@ -691,8 -530,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -537,6 +700,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -816,8 -631,6 +816,8 @@@ msgstr "
msgid "Yes"
msgstr "sim"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -868,19 -674,16 +868,19 @@@ msgstr "muda a frase secreta
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "activa uma chave"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1743,8 -1359,6 +1743,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -2040,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
@@@ -2289,8 -1786,6 +2289,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2315,8 -1806,6 +2315,8 @@@ msgstr "chave %08lX: tipo PGP 2.x - ign
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2327,8 -1815,6 +2327,8 @@@ msgstr "erro ao criar `%s': %s\n
msgid "[User ID not found]"
msgstr "[Utilizador não encontrado]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opções de importação inválidas\n"
@@@ -2364,260 -1844,204 +2364,260 @@@ msgstr "erro ao criar `%s': %s\n
msgid "No fingerprint"
msgstr "mostra impressão digital"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chave `%s' não encontrada: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "cifrar dados"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra simétrica"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "decifrar dados (acção por omissão)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "listar as chaves"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impressões digitais"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revogação"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves público"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportar chaves para um servidor de chaves"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importar chaves de um servidor de chaves"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "procurar chaves num servidor de chaves"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importar/fundir chaves"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "actualizar a base de dados de confiança"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "criar saída com armadura ascii"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|estabelecer nível de compressão N\n"
"(0 desactiva)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "usar modo de texto canônico"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "não fazer alterações"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrepôr"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2625,7 -2049,6 +2625,7 @@@ msgstr "
"@\n"
"(Veja a página man para uma lista completa de comandos e opções)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2655,13 -2078,11 +2655,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impressões digitais\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2676,7 -2097,6 +2676,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a operação por omissão depende dos dados de entrada\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2684,547 -2104,431 +2684,547 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Chave pública: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Dispersão: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compressão: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opções] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "criado um novo ficheiro de configuração `%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave está"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Endereço eletrónico inválido\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opções de importação inválidas\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opções de importação inválidas\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "opções de importação inválidas\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s não é um conjunto de caracteres válido\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s não é um conjunto de caracteres válido\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, 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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opções de exportação inválidas\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "opções de exportação inválidas\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, 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:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrepõe %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s não é permitido com %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s não faz sentido com %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
#, 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:3746
++#: g10/gpg.c:3749
#, 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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferências por omissão inválidas\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferências pessoais de cifra inválidas\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferências pessoais de 'digest' inválidas\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferências pessoais de compressão inválidas\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s não faz sentido com %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, 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:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualização da chave secreta falhou: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
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:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de política de assinatura dada é inválida\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de política de assinatura dada é inválida\n"
@@@ -3797,8 -2990,6 +3797,8 @@@ msgstr "[revogação]
msgid "[self-signature]"
msgstr "[auto-assinatura]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
@@@ -4617,15 -3648,10 +4617,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "revkey"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5591,26 -4438,22 +5591,26 @@@ msgstr " Impressão da chave =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "a verificar o porta chaves `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5618,7 -4461,6 +5618,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 assinatura incorrecta\n"
msgstr[1] "1 assinatura incorrecta\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
@@@ -5712,7 -4535,6 +5712,7 @@@ msgstr "a pedir a chave %08lX de %s\n
msgid "no keyserver known\n"
msgstr "opções de exportação inválidas\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignorado `%s': %s\n"
@@@ -6019,124 -4780,90 +6019,112 @@@ msgstr "armadura: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opção depreciada \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor utilize \"%s%s\" em vez dela\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVISO: \"%s\" é uma opção depreciada\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
#, fuzzy
msgid "Uncompressed"
msgstr "não processado"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "não processado"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensagem poderá não ser utilizável pelo %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "a ler opções de `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Arquivo `%s' já existe. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufixo desconhecido\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Digite novo nome de ficheiro"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "a escrever em \"stdout\"\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "a assumir dados assinados em `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "criado um novo ficheiro de configuração `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossível manipular algoritmo de chave pública %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@@ -6941,21 -5519,17 +6929,21 @@@ msgstr "a assinar:
msgid "%s encryption will be used\n"
msgstr "será utilizada a cifragem %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignorado `%s': duplicada\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "ignorado: a chave secreta já está presente\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7042,7 -5600,6 +7030,7 @@@ msgstr "transação de base de dados d
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossível fechar `%s': %s\n"
@@@ -7185,10 -5714,6 +7173,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:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -7220,7 -5740,6 +7208,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -7249,126 -5764,103 +7237,122 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listar as chaves"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "Repita a frase secreta\n"
msgstr[1] "Repita a frase secreta\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
@@@ -7376,148 -5868,122 +7360,148 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d assinaturas removidas.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
msgid "Encrypted 0 messages."
msgstr "Repita a frase secreta\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Política: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7534,18 -6000,14 +7518,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9724,8 -7741,6 +9708,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/ro.po
index 9ec68b1,82138a4..f0127f9
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -111,8 -93,6 +111,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "frază-parolă incorectă"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -157,89 -129,61 +157,89 @@@ msgstr "MPI incorect
msgid "Bad Passphrase"
msgstr "frază-parolă incorectă"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "schimbă fraza-parolă"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -247,7 -191,6 +247,7 @@@
msgstr ""
"Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am eşuat să creez hashtable: %s\n"
@@@ -419,10 -331,6 +419,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Cheia este înlocuită"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "locvace"
@@@ -531,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 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"
@@@ -551,36 -427,25 +551,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -627,15 -483,11 +627,15 @@@ msgstr "actualizarea a eşuat: %s\n
msgid "listening on socket '%s'\n"
msgstr "scriu cheia secretă în `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -676,18 -521,14 +676,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a eşuat: %s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: sărită: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@@ -703,8 -542,6 +703,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -712,9 -549,6 +712,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -831,8 -646,6 +831,8 @@@ msgstr "
msgid "Yes"
msgstr "da"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -883,7 -689,6 +883,7 @@@ msgstr "schimbă fraza-parolă
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -891,13 -696,11 +891,13 @@@
"%%0A?"
msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "activează cheia"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1754,8 -1370,6 +1754,8 @@@ msgstr "Eroare: URL prea lung (limita e
msgid "error reading '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -2039,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
@@@ -2293,8 -1790,6 +2293,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: sărită: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2318,8 -1809,6 +2318,8 @@@ msgstr "cheia %s: cheie stil PGP 2.x -
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2329,8 -1817,6 +2329,8 @@@ msgstr "eroare la creearea `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost găsit]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opţiuni enumerare invalide\n"
@@@ -2366,255 -1846,199 +2366,255 @@@ msgstr "eroare la creearea `%s': %s\n
msgid "No fingerprint"
msgstr "Amprenta CA: "
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "folosim subcheia %s în loc de cheia primară %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "|[fişier]|crează o semnătură"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fişier]|crează o semnătură text în clar"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "crează o semnătură detaşată"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "cifrează datele"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "cifrează numai cu cifru simetric"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "decriptează datele (implicit)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifică o semnătură"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "enumeră chei"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "enumeră chei şi semnături"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "enumeră şi verifică semnăturile cheii"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "enumeră chei şi amprente"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "enumeră chei secrete"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generează o nouă perechi de chei"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "generează un certificat de revocare"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "şterge chei de pe inelul de chei public"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "şterge chei de pe inelul de chei secret"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "semnează o cheie"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "semnează o cheie local"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "semnează o cheie"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "semnează o cheie local"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "semnează sau editează o cheie"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "schimbă fraza-parolă"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportă chei"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportă chei pentru un server de chei"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importă chei de la un server de chei"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "caută pentru chei pe un server de chei"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "actualizează toate cheile de la un server de chei"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importă/combină chei"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "afişează starea cardului"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "schimbă data de pe card"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "schimbă PIN-ul unui card"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "actualizează baza de date de încredere"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [fişiere]|afişează rezumate mesaje"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "crează ieşire în armură ascii"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "foloseşte acest id-utilizator pentru a semna sau decripta"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|setează nivel de compresie N (0 deactivează)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "foloseşte modul text canonic"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "întreabă înainte de a suprascrie"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "foloseşte comportament strict OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2622,7 -2046,6 +2622,7 @@@ msgstr "
"@\n"
"(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2652,13 -2075,11 +2652,13 @@@ msgstr "
" --list-keys [nume] arată chei\n"
" --fingerprint [nume] arată amprente\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2673,7 -2094,6 +2673,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"operaţiunea implicită depinde de datele de intrare\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2681,78 -2101,64 +2681,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [opţiuni] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "comenzi în conflict\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "nu am găsit nici un semn = în definiţia grupului `%s'\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigură (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigură (unsafe) pentru fişier configurare `%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru fişier configurare `%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2760,7 -2166,6 +2760,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2770,7 -2175,6 +2770,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
"configurare `%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2778,7 -2182,6 +2778,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2786,7 -2189,6 +2786,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2797,7 -2199,6 +2797,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
"configurare `%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2805,459 -2206,362 +2805,459 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, 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:1953
++#: g10/gpg.c:1956
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opţiune necunoscută `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Nu este o adresă de email validă\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opţiuni server de chei invalide\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "opţiuni server de chei invalide\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opţiuni import invalide\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "opţiuni import invalide\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opţiuni export invalide\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "opţiuni export invalide\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opţiuni enumerare invalide\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opţiuni verificare invalide\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "opţiuni verificare invalide\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execuţie ca %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opţiuni verificare invalide\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s înlocuieşte %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie să fie mai mare decât 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "preferinţe implicite invalide\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "preferinţe cifrare personale invalide\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "preferinţe rezumat personale invalide\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "preferinţe compresie personale invalide\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge încă cu %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am eşuat să iniţializez TrustDB:%s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei eşuată: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepţie server de chei eşuată: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie eşuat: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "căutare server de chei eşuată: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei eşuată: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a eşuat: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a eşuat: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eroare la obţinerea numărului serial: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semnături furnizat este invalid\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -3832,8 -3025,6 +3832,8 @@@ msgstr "[revocare]
msgid "[self-signature]"
msgstr "[auto-semnătură]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@@ -4623,14 -3654,9 +4623,14 @@@ msgstr "
"corectă dacă nu reporniţi programul.\n"
#
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "revocată"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "expirată"
@@@ -5593,13 -4440,11 +5593,13 @@@ msgstr " Amprentă cheie =
msgid " Card serial no. ="
msgstr " Card nr. serie ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, 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:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5607,14 -4452,12 +5607,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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5622,7 -4465,6 +5622,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 semnătură incorectă\n"
msgstr[1] "1 semnătură incorectă\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
@@@ -5716,7 -4539,6 +5716,7 @@@ msgstr "cer cheia %s de la %s\n
msgid "no keyserver known\n"
msgstr "nici o acţiune pentru serverul de chei!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "sărită \"%s\": %s\n"
@@@ -6020,128 -4781,93 +6020,115 @@@ msgstr "eroare citire în `%s': %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opţiune învechită \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "AVERTISMENT: \"%s\" este o comandă învechită - nu o folosiţi\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Necompresat"
#
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "necompresat|niciunul"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "acest mesaj s-ar putea să nu poată fi folosit de %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opţiune ambiguă `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opţiune necunoscută `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Tip de semnătură necunoscut `%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Fişierul `%s' există. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufix necunoscut\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Introduceţi un nou nume-fişier"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "scriu la stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "presupun date semnate în `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "fişier de configurare nou `%s' creat\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "AVERTISMENT: opţiunile din %s nu sunt încă active în timpul acestei rulări\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nu pot mânui algoritmul cu cheie publică %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVERTISMENT: cheie de sesiune cifrată simetric potenţial nesigură "
"(insecure)\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
@@@ -6970,20 -5547,16 +6957,20 @@@ msgstr "semnare:
msgid "%s encryption will be used\n"
msgstr "va fi folosită cifrarea %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "cheia nu este marcată ca sigură - nu o pot folosi cu GNA falsificat!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "sărită \"%s\": duplicată\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "sărită: cheia secretă deja prezentă\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
@@@ -7073,7 -5630,6 +7060,7 @@@ msgstr "tranzacţia trustdb prea mare\n
msgid "%s: directory does not exist!\n"
msgstr "%s: directorul nu există!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7217,10 -5745,6 +7204,10 @@@ msgstr "eroare la crearea frazei-parol�
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -7252,7 -5771,6 +7239,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "eroare în `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -7281,59 -5795,46 +7268,55 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "enumeră chei şi ID-uri utilizator"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politica: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "enumeră chei"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7341,68 -5842,58 +7324,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "cifrată cu %lu fraze-parolă\n"
msgstr[1] "cifrată cu %lu fraze-parolă\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [fişiere]|afişează rezumate mesaje"
@@@ -7410,149 -5901,123 +7393,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Am şters %d semnături.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "cifrată cu %lu fraze-parolă\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Politica: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7569,18 -6034,14 +7552,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9776,8 -7792,6 +9759,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/ru.po
index 4983480,bc025f7..afa1574
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\n"
"PO-Revision-Date: 2017-03-01 17:17+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@@ -109,8 -91,6 +109,8 @@@ msgstr "PIN:
msgid "Passphrase:"
msgstr "Фраза-пароль:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "не подходит - попробуйте еще раз"
@@@ -150,61 -122,38 +150,61 @@@ msgstr "Неверный PIN
msgid "Bad Passphrase"
msgstr "Неверная фраза-пароль"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не могу создать '%s': %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "ошибка получения серийного номера карты: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "обнаружена карта, серийный номер: %s\n"
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "на карте не найдено подходящего ключа: %s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, c-format
msgid "error getting list of cards: %s\n"
msgstr "ошибка получения списка карт: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -213,24 -162,19 +213,24 @@@ msgstr "
"Процесс ssh запросил доступ к ключу%%0A %s%%0A (%s)%%0AВы хотите это "
"позволить?"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Позволить"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Отказать"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Повторите фразу-пароль:"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -239,7 -183,6 +239,7 @@@ msgstr "
"Введите фразу-пароль для защиты полученного секретного ключа%%0A %s%%0A "
"%s%%0Aвнутри хранилища ключей агента gpg"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
@@@ -401,10 -313,6 +401,10 @@@ msgstr "запуск в режиме с
msgid "run in supervised mode"
msgstr "запуск в подконтрольном режиме"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "подробно"
@@@ -503,11 -386,6 +503,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
@@@ -523,33 -399,22 +523,33 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
@@@ -593,14 -449,10 +593,14 @@@ msgstr "сбой listen(): %s\n
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не могу создать каталог '%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "создан каталог '%s'\n"
@@@ -640,18 -485,14 +640,18 @@@ msgstr "обработчик ssh 0x%lx
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -668,8 -507,6 +668,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -677,9 -514,6 +677,9 @@@ msgstr "
"@Команды:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -794,8 -609,6 +794,8 @@@ msgstr "
msgid "Yes"
msgstr "Да"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Нет"
@@@ -848,18 -654,15 +848,18 @@@ msgstr "Сменить фразу-па�
msgid "I'll change it later"
msgstr "Сменю позже"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Удалить ключ"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1656,8 -1272,6 +1656,8 @@@ msgstr "Ошибка: Слишком д
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
@@@ -1935,22 -1485,14 +1935,22 @@@ msgstr "Недопустимая ком
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:246 g10/gpg.c:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
@@@ -2172,8 -1669,6 +2172,8 @@@ msgstr "пользоваться арх
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
@@@ -2196,8 -1687,6 +2196,8 @@@ msgstr "ключ %s: ключ типа
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2206,8 -1694,6 +2206,8 @@@
msgid "[User ID not found]"
msgstr "[Идентификатор пользователя не найден]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(проверьте аргумент параметра '%s')\n"
@@@ -2243,236 -1723,180 +2243,236 @@@ msgstr "ошибка получени�
msgid "No fingerprint"
msgstr "Нет отпечатка"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "секретный ключ \"%s\" не найден: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr ""
"\"%s\" используется в качестве основного секретного ключа для подписи\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "все значения, переданные в '%s', игнорируются\n"
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
"достоверным\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "создать подпись"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "зашифровать данные"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "вывести список ключей"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "вывести список секретных ключей"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "быстро создать новую пару ключей"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "быстро добавить новый идентификатор пользователя"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
msgstr "быстро отозвать идентификатор пользователя"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly set a new expiration date"
msgstr "быстро установить новый срок действия"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "создание полноценной пары ключей"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы секретных ключей"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "быстро подписать ключ"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "быстро подписать ключ локально"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "подписать ключ"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "подписать ключ локально"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "экспортировать ключи"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "экспортировать ключи на сервер ключей"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "импортировать ключи с сервера ключей"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "искать ключи на сервере ключей"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "показать состояние карты"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "изменить данные на карте"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "сменить PIN карты"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "обновить таблицу доверия"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "вывести хеши сообщений"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "запуск в режиме сервера"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|установить правила TOFU для ключа"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "не делать никаких изменений"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2480,7 -1904,6 +2480,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
msgid ""
"@\n"
"Examples:\n"
@@@ -2500,11 -1923,9 +2500,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2514,7 -1935,6 +2514,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2522,94 -1942,76 +2522,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Хеш-функции: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2617,449 -2019,351 +2617,449 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все замечания"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей замечания стандарта IETF"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские замечания"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
"показать в списке ключей действительность идентификаторов пользователей"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показать в списке ключей отозванные и просроченные идентификаторы "
"пользователей"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, c-format
msgid "valid values for option '%s':\n"
msgstr "недопустимые значения для параметра \"%s\"\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "неизвестные правила TOFU '%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" выведет список вариантов)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, c-format
msgid "invalid value for option '%s'\n"
msgstr "недопустимое значения для параметра \"%s\"\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "\"%s\" не является адресом электронной почты\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода пароля '%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, c-format
msgid "invalid filter option: %s\n"
msgstr "недопустимый параметр фильтра: %s\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все замечания"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей замечания стандарта IETF"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские замечания"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr ""
"показать при проверке подписей действительность идентификаторов пользователей"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные идентификаторы "
"пользователя"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr ""
"показать при проверке подписей только первичный идентификатор пользователя"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция для сертификации\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хеш-функции\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "сбой при экспорте в виде ключа ssh: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хеш-функция '%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr "Внимание: команда не отдана. Пытаюсь угадать, что имелось в виду ...\n"
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -3619,8 -2812,6 +3619,8 @@@ msgstr "[отзыв]
msgid "[self-signature]"
msgstr "[самоподпись]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "ошибка выделения памяти: %s\n"
@@@ -4395,14 -3426,9 +4395,14 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "отозван"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "просрочен"
@@@ -5335,12 -4182,10 +5335,12 @@@ msgstr " Отпечаток клю
msgid " Card serial no. ="
msgstr " серийный номер карты ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "занесение таблицы ключей '%s' в буфер\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5348,7 -4193,6 +5348,7 @@@ msgstr[0] "пока в буфер по�
msgstr[1] "пока в буфер помещено %lu ключей (%lu подписи)\n"
msgstr[2] "пока в буфер помещено %lu ключей (%lu подписей)\n"
- #: g10/keyring.c:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5356,7 -4200,6 +5356,7 @@@ msgstr[0] "в буфер записа�
msgstr[1] "в буфер записаны %lu ключа"
msgstr[2] "в буфер записано %lu ключей"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
@@@ -5364,7 -4207,6 +5364,7 @@@ msgstr[0] "(%lu подпись)\n
msgstr[1] "(%lu подписи)\n"
msgstr[2] "(%lu подписей)\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей создана\n"
@@@ -5455,7 -4278,6 +5455,7 @@@ msgstr "получение ключа %
msgid "no keyserver known\n"
msgstr "ни один сервер ключей не известен\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено \"%s\": %s\n"
@@@ -5749,120 -4510,88 +5749,110 @@@ msgstr "(сообщенная ошиб�
msgid "(further info: "
msgstr "(дальнейшие сведения: "
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "используйте вместо этого \"%s%s\"\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: \"%s\" в этом файле устарело - оно действует только в %s\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "Внимание: параметр \"%s%s\" устарел - он действует только для %s\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Без сжатия"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "без сжатия|без|none"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "данное сообщение может быть непригодно для %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначный параметр '%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "неизвестный параметр '%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "неизвестный слабый хеш '%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Файл '%s' существует. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Записать поверх? (y/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: неизвестное окончание\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Введите новое имя файла"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "вывод в stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "предполагается, что подписанные данные находятся в '%s'\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "создан новый файл настроек '%s'\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "Внимание: параметры в '%s' при этом запуске еще не действуют\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "не могу использовать алгоритм с открытым ключом %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"Внимание: потенциально небезопасный сеансовый ключ,\n"
" зашифрованный симметричным шифром\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "в подпакете типа %d установлен критический бит\n"
@@@ -6661,22 -5241,18 +6651,22 @@@ msgstr "подпись:
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не помечен как небезопасный - не могу использовать его с фальшивым "
"генератором случайных чисел!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено \"%s\": дубликат\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "пропущено: секретный ключ уже имеется\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
@@@ -6760,7 -5320,6 +6750,7 @@@ msgstr "слишком большая �
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "нет доступа к '%s': %s\n"
@@@ -6898,10 -5429,6 +6888,10 @@@ msgstr "ошибка создания �
msgid "TOFU DB error"
msgstr "ошибка базы данных TOFU"
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "ошибка чтения базы данных TOFU: %s\n"
@@@ -6931,7 -5453,6 +6921,7 @@@ msgstr "добавление столб
msgid "error opening TOFU database '%s': %s\n"
msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "ошибка обновления базы данных TOFU: %s\n"
@@@ -6965,26 -5482,21 +6955,26 @@@ msgstr "
"Укажите, пожалуйста, следует ли связать этот адрес электронной почты с "
"ключом %s или вы думаете, что кто-то выдает себя за \"%s\"."
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "ошибка при сборе идентификаторов других пользователей: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
msgid "This key's user IDs:\n"
msgstr "Идентификаторы пользователя этого ключа:\n"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "ошибка сбора статистики подписей: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, 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"
@@@ -6992,20 -5504,13 +6982,16 @@@ msgstr[0] "Адрес электрон�
msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ", "
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
msgid "this key"
msgstr "этот ключ"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
@@@ -7013,7 -5518,6 +6999,7 @@@ msgstr[0] "Проверено %d соо
msgstr[1] "Проверены %d сообщения."
msgstr[2] "Проверено %d сообщений."
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
@@@ -7021,7 -5525,6 +7007,7 @@@ msgstr[0] "Зашифровано %d с
msgstr[1] "Зашифрованы %d сообщения."
msgstr[2] "Зашифровано %d сообщений."
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
@@@ -7029,7 -5532,6 +7015,7 @@@ msgstr[0] "Проверено %d соо
msgstr[1] "Проверены %d сообщения в будущем."
msgstr[2] "Проверено %d сообщений в будущем."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
@@@ -7037,7 -5539,6 +7023,7 @@@ msgstr[0] "Зашифровано %d с
msgstr[1] "Зашифрованы %d сообщения в будущем."
msgstr[2] "Зашифровано %d сообщений в будущем."
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7045,7 -5546,6 +7031,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших дня: %d."
msgstr[2] "Проверено сообщений за %d прошедших дней: %d."
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7053,7 -5553,6 +7039,7 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших дня: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших дней: %d."
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7061,7 -5560,6 +7047,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших месяца: %d."
msgstr[2] "Проверено сообщений за %d прошедших месяцев: %d."
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7069,7 -5567,6 +7055,7 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших месяца: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших месяцев: %d."
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7077,7 -5574,6 +7063,7 @@@ msgstr[0] "Проверено сооб�
msgstr[1] "Проверено сообщений за %d прошедших года: %d."
msgstr[2] "Проверено сообщений за %d прошедших лет: %d."
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7085,12 -5581,10 +7071,12 @@@ msgstr[0] "Зашифровано со�
msgstr[1] "Зашифровано сообщений за %d прошедших года: %d."
msgstr[2] "Зашифровано сообщений за %d прошедших лет: %d."
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr "Проверено сообщений в прошлом: %d."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "Зашифровавно сообщений в прошлом: %d."
@@@ -7098,7 -5592,6 +7084,7 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
"Обычно с конкретным адресом электронной почты связан только один ключ. "
@@@ -7110,39 -5603,31 +7096,39 @@@
#. 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
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr "Принимается исходное значение (\"неизвестно\").\n"
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr "Обнаружено повреждение базы данных TOFU.\n"
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, c-format
msgid "resetting keydb: %s\n"
msgstr "сброс базы данных ключей: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "ошибка установки правил привязки TOFU в %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "ошибка при смене правила TOFU: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7150,7 -5635,6 +7136,7 @@@ msgstr[0] "%lld~прошедший~го
msgstr[1] "%lld~прошедших~года"
msgstr[2] "%lld~прошедших~лет"
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7158,7 -5642,6 +7144,7 @@@ msgstr[0] "%lld~прошедший~ме
msgstr[1] "%lld~прошедших~месяца"
msgstr[2] "%lld~прошедших~месяцев"
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7166,7 -5649,6 +7152,7 @@@ msgstr[0] "%lld~прошедшую~не
msgstr[1] "%lld~прошедшие~недели"
msgstr[2] "%lld~прошедших~недель"
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7174,7 -5656,6 +7160,7 @@@ msgstr[0] "%lld~прошедший~де
msgstr[1] "%lld~прошедших~дня"
msgstr[2] "%lld~прошедших~дней"
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7182,7 -5663,6 +7168,7 @@@ msgstr[0] "%lld~прошедший~ча
msgstr[1] "%lld~прошедших~часа"
msgstr[2] "%lld~прошедших~часов"
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7190,7 -5670,6 +7176,7 @@@ msgstr[0] "%lld~прошедшую~ми
msgstr[1] "%lld~прошедшие~минуты"
msgstr[2] "%lld~прошедших~минут"
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7198,17 -5677,14 +7184,17 @@@ msgstr[0] "%lld~прошедшую~се
msgstr[1] "%lld~прошедшие~секунды"
msgstr[2] "%lld~прошедших~секунд"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: Проверено 0~подписей, зашифровано 0~сообщений."
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: Проверено 0 подписей."
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, c-format
msgid "%s: Verified %ld~signature in the past %s."
msgid_plural "%s: Verified %ld~signatures in the past %s."
@@@ -7216,11 -5692,9 +7202,11 @@@ msgstr[0] "%s: Проверена %ld~�
msgstr[1] "%s: Проверены %ld~прописи за %s."
msgstr[2] "%s: Проверено %ld~подписей за %s."
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
msgid "Encrypted 0 messages."
msgstr "Зашифровано 0 сообщений."
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, c-format
msgid "Encrypted %ld~message in the past %s."
msgid_plural "Encrypted %ld~messages in the past %s."
@@@ -7228,36 -5702,30 +7214,36 @@@ msgstr[0] "Зашифровано %ld~�
msgstr[1] "Зашифрованы %ld~сообщения за %s."
msgstr[2] "Зашифровано %ld~сообщений за %s."
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, c-format
msgid "(policy: %s)"
msgstr "правило: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
"Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
"ключом и этим идентификатором пользователя!\n"
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
"Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
"ключом и этим идентификатором пользователя!\n"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
"Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
"Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7290,20 -5758,16 +7276,20 @@@ msgstr[2] "
"некачественный командой\n"
" %s\n"
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "ошибка при открытии базы данных TOFU: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
"идентификаторов пользователя\n"
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -9450,8 -7469,6 +9436,8 @@@ msgstr "
"Доступ к списку отозванных сертификатов невозможен\n"
"из-за того, что не задействуется %s\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
#, c-format
msgid "error initializing reader object: %s\n"
msgstr "ошибка инициализации объекта устройства чтения: %s\n"
diff --cc po/sk.po
index ee6fe14,fb3e686..6a2d20b
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -107,8 -89,6 +107,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "nesprávne heslo"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -153,95 -125,66 +153,95 @@@ msgstr "nesprávne MPI
msgid "Bad Passphrase"
msgstr "nesprávne heslo"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochranný algoritmus %d%s nie je podporováný\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "zmeniť heslo"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
@@@ -407,10 -319,6 +407,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "Kľúč je nahradený"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "s dodatočnými informáciami"
@@@ -519,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -541,36 -417,25 +541,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -617,15 -473,11 +617,15 @@@ msgstr "aktualizácia zlyhala: %s\n
msgid "listening on socket '%s'\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "nemôžem vytvoriť adresár `%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: adresár vytvorený\n"
@@@ -665,18 -510,14 +665,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskočené: %s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@@ -692,8 -531,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -538,6 +701,9 @@@ msgstr "
"@Príkazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -817,8 -632,6 +817,8 @@@ msgstr "
msgid "Yes"
msgstr "ano"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -869,19 -675,16 +869,19 @@@ msgstr "zmeniť heslo
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, 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:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
msgid "Delete key"
msgstr "nastaviť kľúč ako platný (enable)"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1743,8 -1359,6 +1743,8 @@@ msgstr "
msgid "error reading '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: 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"
@@@ -2040,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, 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:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri čítaní bloku kľúča: %s\n"
@@@ -2293,8 -1790,6 +2293,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: preskočené: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2319,8 -1810,6 +2319,8 @@@ msgstr "kľúč %08lX: PGP 2.x kľúč
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: nič nebolo vyexportované\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2331,8 -1819,6 +2331,8 @@@ msgstr "chyba pri vytváraní `%s': %s\
msgid "[User ID not found]"
msgstr "[User id not found]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "neplatný parameter pre import\n"
@@@ -2368,262 -1848,206 +2368,262 @@@ msgstr "chyba pri vytváraní `%s': %s\
msgid "No fingerprint"
msgstr "vypísať fingerprint"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, fuzzy, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Neplatný kľúč %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "používam sekundárny kľúč %08lX namiesto primárneho kľúča %08lX\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "vytvoriť podpis oddelený od dokumentu"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[súbor]|vytvoriť podpis v čitateľnom dokumente"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "vytvoriť podpis oddelený od dokumentu"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "šifrovať dáta"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "šifrovanie len so symetrickou šifrou"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dešifrovať dáta (implicitne)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "verifikovať podpis"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "vypísať zoznam kľúčov"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "vypísať zoznam kľúčov a podpisov"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolovať podpisy kľúčov"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "vypísať zoznam kľúčov a fingerprintov"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "vypísať zoznam tajných kľúčov"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "vytvoriť revokačný certifikát"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "odstrániť kľúč zo súboru verejných kľúčov"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "odstrániť kľúč zo súboru tajných kľúčov"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "podpísať kľúč"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "podpísať kľúč lokálne"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "podpísať kľúč"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "podpísať kľúč lokálne"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "podpísať alebo modifikovať kľúč"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "zmeniť heslo"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportovať kľúče"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportovať kľúče na server kľúčov"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importovať kľúče zo servera kľúčov"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "vyhľadať kľúče na serveri kľúčov"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "aktualizovať všetky kľúče zo servera kľúčov"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importovať/zlúčiť kľúče"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "aktualizovať databázu dôvery"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|algo [súbory]|vypíš hash"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "vytvor výstup zakódovaný pomocou ASCII"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|šifrovať pre MENO"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"použiť toto id užívateľa na podpísanie\n"
" alebo dešifrovanie"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
" komprimácia)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "použiť kánonický textový mód"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 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"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "nevykonať žiadne zmeny"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "vyžiadať potvrdenie pred prepísaním"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2632,7 -2056,6 +2632,7 @@@ msgstr "
"(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
"možností)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2662,13 -2085,11 +2662,13 @@@ msgstr "
" --list-keys [mená] vypísať kľúče\n"
" --fingerprint [mená] vypísať fingerprinty\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2683,7 -2104,6 +2683,7 @@@ msgstr "
"podpísať, overiť, šifrovať alebo dešifrovať\n"
"implicitné operácie závisia od vstupných dát\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2691,553 -2111,437 +2691,553 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Verejné kľúče: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Šifry: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "použitie: gpg [možnosti] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "konfliktné príkazy\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznáma položka konfigurácie \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
#, 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:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
#, 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:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
#, 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:3179
++#: g10/gpg.c:3182
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parameter pre import\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
msgid "invalid filter option: %s\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parameter pre import\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatný parameter pre import\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platná znaková sada\n"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatný parameter pre export\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemožno nastaviť exec-path na %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný parameter pre export\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prepíše %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolené používať %s s %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedáva s %s zmysel!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "položka completes-needed musí byť väčšia ako 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "položka marginals-needed musí byť väčšia ako 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
#, 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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "neplatné defaultné predvoľby\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ešte nepracuje s %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemôžem inicializovať databázu dôvery: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dešifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo poslať kľúč na server: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export kľúča: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa nájsť server: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualizácia servera zlyhala: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Začnite písať svoju správu ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@@ -3811,8 -3004,6 +3811,8 @@@ msgstr "[revokácia]
msgid "[self-signature]"
msgstr "[podpis kľúča ním samým]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
@@@ -4628,15 -3659,10 +4628,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
#, fuzzy
msgid "revoked"
msgstr "[revokované]"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
#, fuzzy
msgid "expired"
msgstr "expire"
@@@ -5596,26 -4443,22 +5596,26 @@@ msgstr " Fingerprint kľúča =
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolujem súbor kľúčov (keyring) `%s'\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5623,7 -4466,6 +5623,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 zlý podpis\n"
msgstr[1] "1 zlý podpis\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: súbor kľúčov (keyring) vytvorený\n"
@@@ -5717,7 -4540,6 +5717,7 @@@ msgstr "požadujem kľúč %08lX z %s\n
msgid "no keyserver known\n"
msgstr "neplatný parameter pre export\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "preskočený `%s': %s\n"
@@@ -6026,124 -4787,90 +6026,112 @@@ msgstr "chyba pri čítaní: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použite namiesto neho \"%s%s\" \n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Nekomprimované"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
#, fuzzy
msgid "uncompressed|none"
msgstr "Nekomprimované"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "táto správa nemusí použiteľná s %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "čítam možnosti z `%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "neznáma trieda podpisu"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Súbor `%s' existuje. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Prepísať (a/N)? "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: neznáma prípona\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Vložte nový názov súboru"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "zapisujem na štandardný výstup (stdout)\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "predpokladám podpísané dáta v `%s'\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "vytvorený nový konfiguračný súbor `%s'\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "VAROVANIE: nastavenie v `%s' ešte nie je aktívne\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"VAROVANIE: pravdepodobne nebezpečný symetricky šifrovaný kľúč sedenia\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d má nastavený kritický bit\n"
@@@ -6953,22 -5531,18 +6941,22 @@@ msgstr "podpisujem:
msgid "%s encryption will be used\n"
msgstr "bude použité šifrovanie %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"kľúč nie je označený ako nedostatočne bezpečný - nemôžem ho použiť s "
"falošným RNG!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "preskočený `%s': duplikovaný\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "preskočené: tajný kľúč je už v databáze\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
#, fuzzy
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
@@@ -7059,7 -5617,6 +7047,7 @@@ msgstr "transakcia s databázou dôver
msgid "%s: directory does not exist!\n"
msgstr "%s: adresár neexistuje!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "nemôžem zavrieť `%s': %s\n"
@@@ -7202,10 -5731,6 +7190,10 @@@ msgstr "chyba pri vytváraní hesla: %s
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7237,7 -5757,6 +7225,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7266,58 -5781,45 +7254,54 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "vypísať zoznam kľúčov a id užívateľov"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politika: "
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypísať zoznam kľúčov"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|algo [súbory]|vypíš hash"
msgstr[1] "|algo [súbory]|vypíš hash"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7325,68 -5827,58 +7309,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "zašifrované s %lu heslami\n"
msgstr[1] "zašifrované s %lu heslami\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|algo [súbory]|vypíš hash"
msgstr[1] "|algo [súbory]|vypíš hash"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|algo [súbory]|vypíš hash"
msgstr[1] "|algo [súbory]|vypíš hash"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|algo [súbory]|vypíš hash"
@@@ -7394,149 -5886,123 +7378,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Zmazaných %d podpisov.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "zašifrované s %lu heslami\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "Policy: "
msgid "(policy: %s)"
msgstr "Politika: "
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7553,18 -6019,14 +7537,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9744,8 -7761,6 +9728,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/sv.po
index 43ea190,1f9ff53..53567b7
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -136,8 -118,6 +136,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Lösenfras:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "stämmer inte överens - försök igen"
@@@ -180,89 -152,61 +180,89 @@@ msgstr "Felaktig lösenfras
# Skyddssammandraget låter underligt
# Kontrollsumma?
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
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:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Ange denna lösenfras igen"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -271,7 -215,6 +271,7 @@@ msgstr "
"Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A %s%%0Ai "
"gpg-agents nyckellager"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@@ -454,10 -366,6 +454,10 @@@ msgstr "kör i serverläge (förgrund)
msgid "run in supervised mode"
msgstr "kör i serverläge"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "utförlig"
@@@ -564,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Rapportera fel till <@EMAIL@>.\n"
@@@ -592,37 -468,26 +592,37 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, 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:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -673,15 -529,11 +673,15 @@@ msgstr "listen() misslyckades: %s\n
msgid "listening on socket '%s'\n"
msgstr "lyssnar på uttaget \"%s\"\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "%s: kan inte skapa katalog: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -724,19 -569,15 +724,19 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
@@@ -754,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -764,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:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -888,8 -703,6 +888,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -945,7 -751,6 +945,7 @@@ msgstr "ändra lösenfras
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -953,13 -758,11 +953,13 @@@
"%%0A?"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktivera nyckel"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1805,8 -1421,6 +1805,8 @@@ msgstr "Fel: URL:en är för lång (gr�
msgid "error reading '%s': %s\n"
msgstr "fel vid läsning av \"%s\": %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -2108,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
@@@ -2360,8 -1857,6 +2360,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2385,8 -1876,6 +2385,8 @@@ msgstr "nyckeln %s: nyckel av PGP 2.x-t
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2396,8 -1884,6 +2396,8 @@@ msgstr "Fel när \"%s\" skapades: %s\n
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2436,251 -1916,195 +2436,251 @@@ msgstr "fel vid hämtning av \"%s\" vi
msgid "No fingerprint"
msgstr "Inget fingeravtryck"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "skapa en signatur"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "kryptera data"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "kryptering endast med symmetriskt chiffer"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "lista nycklar"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "lista nycklar och signaturer"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "ändra en lösenfras"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "exportera nycklar"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "exportera nycklar till en nyckelserver"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "importera nycklar från en nyckelserver"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "sök efter nycklar hos en nyckelserver"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "skriv ut kortstatus"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "ändra data på ett kort"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "kör i serverläge"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "gör inga ändringar"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "använd strikt OpenPGP-beteende"
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2688,7 -2112,6 +2688,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2718,14 -2141,12 +2718,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2740,7 -2161,6 +2740,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2748,84 -2168,69 +2748,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "användning: gpgsm [flaggor] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
# Extension är vad? FIXME
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2835,21 -2240,18 +2835,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2860,474 -2262,376 +2860,474 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
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:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, 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:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
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:3738
++#: g10/gpg.c:3741
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:3740
++#: g10/gpg.c:3743
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:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
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:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -3914,8 -3107,6 +3914,8 @@@ msgstr "[spärr]
msgid "[self-signature]"
msgstr "[självsignatur]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@@ -4713,14 -3744,9 +4713,14 @@@ msgstr "
"Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
"såvida inte du startar om programmet.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "spärrad"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "utgånget"
@@@ -5698,13 -4545,11 +5698,13 @@@ msgstr "Nyckelns fingeravtryck =
msgid " Card serial no. ="
msgstr " Kortets serienr ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellanlagrar nyckelringen \"%s\"\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5712,14 -4557,12 +5712,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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5727,7 -4570,6 +5727,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 felaktig signatur\n"
msgstr[1] "1 felaktig signatur\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
@@@ -5820,7 -4643,6 +5820,7 @@@ msgstr "begär nyckeln %s från %s\n
msgid "no keyserver known\n"
msgstr "ingen nyckelserveråtgärd!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppade över \"%s\": %s\n"
@@@ -6132,129 -4893,94 +6132,116 @@@ msgstr "läsfel i \"%s\": %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Använd \"%s%s\" istället\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Okomprimerad"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "okomprimerad|ingen"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "detta meddelande kanske inte kan användas av %s\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydlig flagga \"%s\"\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Okänd signaturtyp \"%s\"\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Filen \"%s\" finns. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Skriv över? (j/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: okänt suffix\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Ange nytt filnamn"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "skriver till standard ut\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "antar att signerad data finns i filen \"%s\"\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "ny konfigurationsfil \"%s\" skapad\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@@ -7104,22 -5681,18 +7091,22 @@@ msgid "%s encryption will be used\n
msgstr "krypteringen %s kommer att användas\n"
# Slumptalsgenerator: Random Number Generator
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nyckeln är inte markerad som osäker - det går inte att använda den med "
"fejkad slumptalsgenerator!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppade över \"%s\": förekommer flera gånger\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
@@@ -7209,7 -5766,6 +7196,7 @@@ msgstr "tillitsdatabastransaktion för
msgid "%s: directory does not exist!\n"
msgstr "%s: katalogen finns inte!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7353,10 -5881,6 +7340,10 @@@ msgstr "fel när temporärfil skapades
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7391,7 -5910,6 +7378,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7421,53 -5935,41 +7408,49 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "lista nycklar och användaridentiteter"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "giltighet: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista nycklar"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7475,7 -5977,6 +7458,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7483,7 -5984,6 +7466,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "krypterad med %lu lösenfraser\n"
msgstr[1] "krypterad med %lu lösenfraser\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7491,7 -5991,6 +7474,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7499,54 -5998,46 +7482,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7555,108 -6046,90 +7538,108 @@@ msgstr "skriv ut kontrollsummor
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "fel vid skrivning av nyckel: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "Raderade %d signaturer.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7664,13 -6137,11 +7647,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "krypterad med %lu lösenfraser\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7678,31 -6149,25 +7661,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "giltighet: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7719,19 -6184,15 +7702,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -10030,8 -8046,6 +10013,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/tr.po
index fb92b0d,b707775..d8dd62f
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -110,8 -92,6 +110,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "aynı değiller - tekrar deneyin"
@@@ -151,89 -123,61 +151,89 @@@ msgstr "PIN hatalı
msgid "Bad Passphrase"
msgstr "Anahtar Parolası hatalı"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, 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:2454
++#: 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:2459
++#: 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:2479
++#: 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:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Lütfen bu anahtar parolasını tekrar girin"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, fuzzy, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -242,7 -186,6 +242,7 @@@ 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:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
@@@ -424,10 -336,6 +424,10 @@@ msgstr "sunucu olarak (önalanda) çal�
msgid "run in supervised mode"
msgstr "sunucu kipinde çalışır"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "ayrıntılı"
@@@ -533,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Yazılım hatalarını lütfen <"
@@@ -560,37 -436,26 +560,37 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, 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:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, 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:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, 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:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -639,15 -495,11 +639,15 @@@ msgstr "soket dinleme başarısız: %s\
msgid "listening on socket '%s'\n"
msgstr "`%s' soketi dinlemede\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "`%s' dizini oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -690,19 -535,15 +690,19 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, 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:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -719,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:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -728,9 -565,6 +728,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -854,8 -669,6 +854,8 @@@ msgstr "
msgid "Yes"
msgstr "Evet"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Hayır"
@@@ -910,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:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -918,13 -723,11 +918,13 @@@
"%%0A?"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "anahtarı kullanıma sokar"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1769,8 -1385,6 +1769,8 @@@ msgstr "Hata: URL çok uzun (sınır: %
msgid "error reading '%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
@@@ -2055,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
@@@ -2305,8 -1802,6 +2305,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2330,8 -1821,6 +2330,8 @@@ msgstr "anahtar %s: PGP 2.x tarzı bir
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2341,8 -1829,6 +2341,8 @@@ msgstr "`%s' oluşturulurken hata: %s\n
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2381,250 -1861,194 +2381,250 @@@ msgstr "`%s' %s üzerinden alınırken
msgid "No fingerprint"
msgstr "Parmak izi yok"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "bir imza yapar"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "veriyi şifreler"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "anahtarları listeler"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "anahtarları gönderir"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan indirir"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "bir anahtar sunucusunda anahtarları arar"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "kart durumunu basar"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
"kullanılır"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2632,7 -2056,6 +2632,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2662,13 -2085,11 +2662,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2683,7 -2104,6 +2683,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2691,81 -2111,66 +2691,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "kullanımı: gpgsm [seçenekler] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "grup tanımı '%s' içinde = işareti yok\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2773,19 -2178,16 +2773,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2794,470 -2196,372 +2794,470 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, 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:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
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:1947
++#: g10/gpg.c:1950
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:1949
++#: g10/gpg.c:1952
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:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, 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:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 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:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
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:3244
++#: g10/gpg.c:3247
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:3246
++#: g10/gpg.c:3249
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:3248
++#: g10/gpg.c:3251
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:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
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:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, 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:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 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:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, 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:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 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:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
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:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
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:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
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:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, 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:3981
++#: g10/gpg.c:3984
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:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
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:4085
++#: g10/gpg.c:4088
#, 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:4142
++#: g10/gpg.c:4145
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:4145
++#: g10/gpg.c:4148
#, 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:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, 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:4505
++#: g10/gpg.c:4508
#, 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:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, 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:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, 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:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -3845,8 -3038,6 +3845,8 @@@ msgstr "[yürürlükten kaldırma]
msgid "[self-signature]"
msgstr "[öz-imza]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@@ -4659,14 -3690,9 +4659,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:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "zamanaşımına uğradı"
@@@ -5647,13 -4494,11 +5647,13 @@@ msgstr " Anahtar parmakizi =
msgid " Card serial no. ="
msgstr " Kart seri no. ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "`%s' anahtar zinciri önbellekleniyor\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5661,14 -4506,12 +5661,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:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5676,7 -4519,6 +5676,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 kötü imza\n"
msgstr[1] "1 kötü imza\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anahtar zinciri oluşturuldu\n"
@@@ -5770,7 -4593,6 +5770,7 @@@ msgstr "%s anahtarı %s adresinden iste
msgid "no keyserver known\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\" atlandı: %s\n"
@@@ -6074,129 -4835,94 +6074,116 @@@ msgstr "`%s' için okuma hatası: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "lütfen yerine \"%s%s\" kullanınız\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Sıkıştırılmamış"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "Sıkıştırılmamış|yok"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "bu ileti %s tarafından kullanılamayabilir\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "`%s' seçeneği belirsiz\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "imza türü `%s' bilinmiyor\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "\"%s\" dosyası var. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: bilinmeyen sonek\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Yeni dosya ismini giriniz"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "standart çıktıya yazıyor\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr ""
- "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "%d genel anahtar algoritması kullanılamadı\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@@ -7033,20 -5610,16 +7020,20 @@@ msgstr "imzalanıyor:
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" atlandı: tekrarlanmış\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
@@@ -7134,7 -5691,6 +7121,7 @@@ msgstr "güvence veritabanı işlemi ç
msgid "%s: directory does not exist!\n"
msgstr "%s: dizin yok!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7279,10 -5807,6 +7266,10 @@@ msgstr "geçici dosya oluşturulurken h
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7317,7 -5836,6 +7304,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:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7347,53 -5861,41 +7334,49 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "anahtarları listeler"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
@@@ -7401,7 -5903,6 +7384,7 @@@ msgid_plural "Verified %d messages.
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7409,7 -5910,6 +7392,7 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "%lu anahtar parolası ile şifrelenmiş\n"
msgstr[1] "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
@@@ -7417,7 -5917,6 +7400,7 @@@ msgid_plural "Verified %d messages in t
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
@@@ -7425,54 -5924,46 +7408,54 @@@ msgid_plural "Encrypted %d messages in
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7481,108 -5972,90 +7464,108 @@@ msgstr "ileti özetlerini gösterir
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "anahtarı yazarken hata: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, 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:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "%d imza silindi.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%s: Verified %ld~signature in the past %s."
@@@ -7590,13 -6063,11 +7573,13 @@@ msgid_plural "%s: Verified %ld~signatur
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %ld~message in the past %s."
@@@ -7604,31 -6075,25 +7587,31 @@@ msgid_plural "Encrypted %ld~messages i
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7645,19 -6110,15 +7628,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, 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:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9935,8 -7951,6 +9918,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/uk.po
index 2ed63cc,5102058..ca0d8c0
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -109,8 -91,6 +109,8 @@@ msgstr "Пінкод:
msgid "Passphrase:"
msgstr "Пароль:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "паролі не збігаються, повторіть спробу"
@@@ -150,63 -122,40 +150,63 @@@ msgstr "Помилковий пінко
msgid "Bad Passphrase"
msgstr "Помилковий пароль"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
"підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "помилка під час спроби отримання серійного номера картки: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "виявлено картку з серійним номером: %s\n"
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "не виявлено відповідних ключів картки: %s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -215,24 -164,19 +215,24 @@@ msgstr "
"Процесом ssh надіслано запит щодо використання ключа%%0A %s%%0A "
"(%s)%%0AНадати доступ до цього ключа?"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "Надати"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "Заборонити"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "Будь ласка, повторіть введення пароля"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -241,7 -185,6 +241,7 @@@ msgstr "
"Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A %s"
"%%0A %s%%0Aу сховищі ключів gpg-agent"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "не вдалося створити потік даних з сокета: %s\n"
@@@ -397,10 -309,6 +397,10 @@@ msgstr "запустити у режи�
msgid "run in supervised mode"
msgstr "запустити у режимі із наглядом"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "докладний режим"
@@@ -498,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
@@@ -518,33 -394,22 +518,33 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
@@@ -588,14 -444,10 +588,14 @@@ msgstr "помилка listen(): %s\n
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не вдалося створити каталог «%s»: %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "створено каталог «%s»\n"
@@@ -637,18 -482,14 +637,18 @@@ msgstr "запущено обробни
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -665,8 -504,6 +665,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -674,9 -511,6 +674,9 @@@ msgstr "
"@Команди:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -791,8 -606,6 +791,8 @@@ msgstr "
msgid "Yes"
msgstr "Так"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "Ні"
@@@ -847,7 -653,6 +847,7 @@@ msgstr "Змінити пароль
msgid "I'll change it later"
msgstr "Я зміню його пізніше"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -855,11 -660,9 +855,11 @@@
msgstr ""
"Справді хочете вилучити ключ, що визначається keygrip%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "Вилучити ключ"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1661,8 -1277,6 +1661,8 @@@ msgstr "Помилка: адреса �
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1946,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
@@@ -2188,8 -1685,6 +2188,8 @@@ msgstr "використовувати
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
@@@ -2212,8 -1703,6 +2212,8 @@@ msgstr "ключ %s: ключ у сти
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2222,8 -1710,6 +2222,8 @@@
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(перевірте аргумент параметра «%s»)\n"
@@@ -2258,237 -1738,181 +2258,237 @@@ msgstr "помилка під час с
msgid "No fingerprint"
msgstr "Без відбитка"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "закритий ключ «%s» не знайдено: %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "усі значення, передані «%s», проігноровано\n"
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "створити підпис"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "зашифрувати дані"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "показати список ключів"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "показати список ключів і підписів"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "створити пару ключів"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "швидке створення пари ключів"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
msgid "quickly add a new user-id"
msgstr "швидке додавання нового ідентифікатора користувача"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
msgid "quickly revoke a user-id"
msgstr "швидке відкликання ідентифікатора користувача"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
msgid "quickly set a new expiration date"
msgstr "швидке встановлення нової дати завершення строку дії"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "повноцінне створення пари ключів"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "вилучити ключів з закритого сховища ключів"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "швидко підписати ключ"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "швидко підписати ключ локально"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "підписати ключ"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "підписати ключ локально"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "змінити пароль"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "експортувати ключі"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "експортувати ключі на сервер ключів"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "імпортувати ключі з сервера ключів"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "шукати ключі на сервері ключів"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "оновити всі ключів з сервера ключів"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "імпортувати/об’єднати ключі"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "показати дані про стан картки"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "змінити дані на картці"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "змінити пінкод картки"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "оновити базу даних довіри"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "запустити у режимі сервера"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|встановити вказане правило TOFU для ключа"
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
"ідентифікатор"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "не вносити змін"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "запитувати перед перезаписом"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2497,7 -1921,6 +2497,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
msgid ""
"@\n"
"Examples:\n"
@@@ -2518,11 -1941,9 +2518,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2532,7 -1953,6 +2532,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2540,76 -1960,61 +2540,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2617,21 -2022,18 +2617,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2639,460 -2041,362 +2639,460 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, c-format
msgid "valid values for option '%s':\n"
msgstr "коректні значення параметра «%s»:\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "невідомі правила TOFU «%s»\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr "(команда «help» виводить список можливих варіантів)\n"
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, c-format
msgid "invalid value for option '%s'\n"
msgstr "некоректне значення параметра «%s»\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "«%s» не є коректною адресою електронної пошти\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, c-format
msgid "invalid filter option: %s\n"
msgstr "некоректний параметр фільтрування: %s\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@@ -3654,8 -2847,6 +3654,8 @@@ msgstr "[відкликання]
msgid "[self-signature]"
msgstr "[самопідпис]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "помилка під час спроби отримання області пам’яті: %s\n"
@@@ -4428,14 -3459,9 +4428,14 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "відкликано"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "збіг строк дії"
@@@ -5382,12 -4229,10 +5382,12 @@@ msgstr " Відбиток ключ
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "кешування сховища ключів «%s»\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@@ -5395,7 -4240,6 +5395,7 @@@ msgstr[0] "зараз кешовано
msgstr[1] "зараз кешовано %lu ключів (%lu підписи)\n"
msgstr[2] "зараз кешовано %lu ключів (%lu підписів)\n"
- #: g10/keyring.c:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5403,7 -4247,6 +5403,7 @@@ msgstr[0] "кешовано %lu клю�
msgstr[1] "кешовано %lu ключі"
msgstr[2] "кешовано %lu ключів"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
@@@ -5411,7 -4254,6 +5411,7 @@@ msgstr[0] " (%lu підпис)\n
msgstr[1] " (%lu підписи)\n"
msgstr[2] " (%lu підписів)\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: створено сховище ключів\n"
@@@ -5504,7 -4327,6 +5504,7 @@@ msgstr "надсилаємо запи�
msgid "no keyserver known\n"
msgstr "немає відомих серверів ключів\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено «%s»: %s\n"
@@@ -5803,121 -4564,89 +5803,111 @@@ msgstr "(повідомлена пом�
msgid "(further info: "
msgstr "(подальша інформація: "
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: застарілий параметр «%s»\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "УВАГА: «%s» вважається застарілим параметром\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "будь ласка, скористайтеся «%s%s»\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: «%s» є застарілим у цьому файлі — він працює лише у %s\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
"УВАГА: «%s%s» є застарілим параметром — він не працюватиме, окрім як на %s\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "Нестиснений"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "uncompressed|немає"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначний параметр «%s»\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "невідомий параметр «%s»\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "невідома слабка контрольна сума «%s»\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "Файл «%s» існує. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "Перезаписати? (y/N або т/Н) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: невідомий суфікс\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "Введіть нову назву файла"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "записуємо до stdout\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "припускаємо підписані дані у «%s»\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "створено новий файл налаштувань «%s»\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "УВАГА: параметри у «%s» ще не є активними під час цього запуску\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "робота з алгоритмом створення відкритого ключа %d неможлива\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"УВАГА: потенційно небезпечний зашифрований симетричним алгоритмом ключ "
"сеансу\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "підпакет типу %d містить критичний набір бітів\n"
@@@ -6732,22 -5312,18 +6722,22 @@@ msgstr "підписування:
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не було позначено як ненадійний — не можна використовувати його з "
"фіктивним RNG!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено «%s»: дублювання\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "пропущено: закритий ключ вже існує\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
@@@ -6832,7 -5392,6 +6822,7 @@@ msgstr "занадто велика о�
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "немає доступу до «%s»: %s\n"
@@@ -6973,10 -5504,6 +6963,10 @@@ msgstr "
msgid "TOFU DB error"
msgstr "помилка бази даних TOFU"
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
@@@ -7006,7 -5528,6 +6996,7 @@@ msgstr "додаємо стовпчи�
msgid "error opening TOFU database '%s': %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
@@@ -7040,27 -5557,22 +7030,27 @@@ msgstr "
"Будь ласка, вкажіть, слід пов’язати цю адресу електронної пошти з ключем %s "
"чи ви вважаєте, що хтось видає себе за «%s»."
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
msgid "This key's user IDs:\n"
msgstr "Ідентифікатори користувачів цього ключа:\n"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, c-format
msgid "policy: %s"
msgstr "правило: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr ""
"помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, 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"
@@@ -7068,20 -5580,13 +7058,16 @@@ msgstr[0] "Адресу електро�
msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ", "
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
msgid "this key"
msgstr "цей ключ"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
@@@ -7089,7 -5594,6 +7075,7 @@@ msgstr[0] "Перевірено %d по
msgstr[1] "Перевірено %d повідомлення."
msgstr[2] "Перевірено %d повідомлень."
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
@@@ -7097,7 -5601,6 +7083,7 @@@ msgstr[0] "Зашифровано %d п
msgstr[1] "Зашифровано %d повідомлення."
msgstr[2] "Зашифровано %d повідомлень."
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
@@@ -7105,7 -5608,6 +7091,7 @@@ msgstr[0] "Перевірено %d по
msgstr[1] "Перевірено %d повідомлення у майбутньому."
msgstr[2] "Перевірено %d повідомлень у майбутньому."
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
@@@ -7113,7 -5615,6 +7099,7 @@@ msgstr[0] "Зашифровано %d п
msgstr[1] "Зашифровано %d повідомлення у майбутньому."
msgstr[2] "Зашифровано %d повідомлень у майбутньому."
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
@@@ -7121,7 -5622,6 +7107,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d днів: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d днів: %d."
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
@@@ -7129,7 -5629,6 +7115,7 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d днів: %d."
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
@@@ -7137,7 -5636,6 +7123,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d місяців: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d місяців: %d."
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
@@@ -7145,7 -5643,6 +7131,7 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d місяців: %d."
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
@@@ -7153,7 -5650,6 +7139,7 @@@ msgstr[0] "Перевірено пов�
msgstr[1] "Перевірено повідомлень протягом останніх %d років: %d."
msgstr[2] "Перевірено повідомлень протягом останніх %d років: %d."
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
@@@ -7161,12 -5657,10 +7147,12 @@@ msgstr[0] "Повідомлень, як
msgstr[1] "Повідомлень, які зашифровано протягом останніх %d років: %d."
msgstr[2] "Повідомлень, які зашифровано протягом останніх %d років: %d."
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr "Повідомлень, які перевірено у минулому: %d."
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, c-format
msgid "Messages encrypted in the past: %d."
msgstr "Повідомлень, які зашифровано у минулому: %d."
@@@ -7174,7 -5668,6 +7160,7 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
"Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@@ -7187,42 -5680,34 +7173,42 @@@
#. 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
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr "gGaAuUrRbB"
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
"(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
"(B)Поганий? "
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
#, fuzzy
#| msgid "Defaulting to unknown."
msgid "Defaulting to unknown.\n"
msgstr "Типовим значенням є «невідомий»."
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr "Виявлено пошкодження бази даних TOFU.\n"
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, c-format
msgid "resetting keydb: %s\n"
msgstr "скидаємо базу даних ключів: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "помилка під час спроби встановлення правил прив’язки TOFU до %s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "помилка під час спроби змінити правила TOFU: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
@@@ -7230,7 -5715,6 +7216,7 @@@ msgstr[0] "%lld~рік
msgstr[1] "%lld~роки"
msgstr[2] "%lld~років"
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
@@@ -7238,7 -5722,6 +7224,7 @@@ msgstr[0] "%lld~місяць
msgstr[1] "%lld~місяці"
msgstr[2] "%lld~місяців"
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
@@@ -7246,7 -5729,6 +7232,7 @@@ msgstr[0] "%lld~тиждень
msgstr[1] "%lld~тижні"
msgstr[2] "%lld~тижнів"
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
@@@ -7254,7 -5736,6 +7240,7 @@@ msgstr[0] "%lld~день
msgstr[1] "%lld~дні"
msgstr[2] "%lld~днів"
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
@@@ -7262,7 -5743,6 +7248,7 @@@ msgstr[0] "%lld~година
msgstr[1] "%lld~години"
msgstr[2] "%lld~годин"
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
@@@ -7270,7 -5750,6 +7256,7 @@@ msgstr[0] "%lld~хвилина
msgstr[1] "%lld~хвилини"
msgstr[2] "%lld~хвилин"
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
@@@ -7278,17 -5757,14 +7264,17 @@@ msgstr[0] "%lld~секунда
msgstr[1] "%lld~секунди"
msgstr[2] "%lld~секунд"
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr "%s: перевірено 0~підписів і зашифровано 0~повідомлень."
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, c-format
msgid "%s: Verified 0 signatures."
msgstr "%s: перевірено 0 підписів."
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, c-format
msgid "%s: Verified %ld~signature in the past %s."
msgid_plural "%s: Verified %ld~signatures in the past %s."
@@@ -7296,11 -5772,9 +7282,11 @@@ msgstr[0] "%s: перевірено %ld
msgstr[1] "%s: перевірено %ld~підписи протягом останнього %s."
msgstr[2] "%s: перевірено %ld~підписів протягом останнього %s."
- #: g10/tofu.c:3164
++#: g10/tofu.c:3168
msgid "Encrypted 0 messages."
msgstr "Зашифровано 0 повідомлень."
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, c-format
msgid "Encrypted %ld~message in the past %s."
msgid_plural "Encrypted %ld~messages in the past %s."
@@@ -7308,34 -5782,28 +7294,34 @@@ msgstr[0] "Зашифровано %ld~�
msgstr[1] "Зашифровано %ld~повідомлення протягом останнього %s."
msgstr[2] "Зашифровано %ld~повідомлень протягом останнього %s."
- #: g10/tofu.c:3183
++#: g10/tofu.c:3187
#, c-format
msgid "(policy: %s)"
msgstr "(правило: %s)"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
"Попередження: ще не існує повідомлень, які було б підписано цим ключем та "
"ідентифікатором користувача!\n"
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
"Попередження: за допомогою цього ключа і ідентифікатора користувача "
"підписано лише одне повідомлення!\n"
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr "Попередження: цим ключем ще не зашифровано жодного повідомлення!\n"
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr "Попередження: цим ключем було зашифровано лише одне повідомлення!\n"
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7371,13 -5839,10 +7357,13 @@@ msgstr[2] "
" %s\n"
"для позначення ключа як помилкового.\n"
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, 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"
@@@ -7385,7 -5850,6 +7371,7 @@@ msgstr "
"ПОПЕРЕДЖЕННЯ: шифруємо до %s, для якого не виявлено не відкликаних "
"ідентифікаторів користувача.\n"
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -9544,8 -7563,6 +9530,8 @@@ msgstr "використовуємо «
msgid "CRL access not possible due to disabled %s\n"
msgstr "Доступ до CRL неможливий через вимкнений %s\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
#, c-format
msgid "error initializing reader object: %s\n"
msgstr "помилка під час спроби ініціалізації об’єкта читання: %s\n"
diff --cc po/zh_CN.po
index 91868ca,f9b5548..e70c3d9
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -111,8 -93,6 +111,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "错误的密码"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr ""
@@@ -157,95 -129,66 +157,95 @@@ msgstr "损坏的多精度整数(MPI)
msgid "Bad Passphrase"
msgstr "错误的密码"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, 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:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, 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:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, fuzzy, c-format
msgid "error getting list of cards: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/command-ssh.c:2781
++#: agent/command-ssh.c:2774
#, 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:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr ""
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr ""
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/command-ssh.c:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, 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:3641
++#: agent/command-ssh.c:3635
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
@@@ -417,10 -329,6 +417,10 @@@ msgstr "
msgid "run in supervised mode"
msgstr "密钥被替换"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "详细模式"
@@@ -528,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"请向 <@EMAIL@> 报告程序缺陷。\n"
@@@ -549,36 -425,25 +549,36 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, 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:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
@@@ -625,15 -481,11 +625,15 @@@ msgstr "更新失败：%s\n
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "can't create directory `%s': %s\n"
msgid "can't create directory '%s': %s\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
@@@ -674,18 -519,14 +674,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -701,8 -540,6 +701,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -710,9 -547,6 +710,9 @@@ msgstr "
"@指令：\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -826,8 -641,6 +826,8 @@@ msgstr "
msgid "Yes"
msgstr "yes"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -878,7 -684,6 +878,7 @@@ msgstr "更改密码
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -886,13 -691,11 +886,13 @@@
"%%0A?"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "启用密钥"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1735,8 -1351,6 +1735,8 @@@ msgstr "错误：URL 太长(至多 %d �
msgid "error reading '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
@@@ -2020,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, 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:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
@@@ -2262,8 -1759,6 +2262,8 @@@ msgstr "
msgid " - skipped"
msgstr "%s：已跳过：%s\n"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, fuzzy, c-format
#| msgid "writing to `%s'\n"
msgid "writing to '%s'\n"
@@@ -2287,8 -1778,6 +2287,8 @@@ msgstr "密钥 %s：PGP 2.x 样式的�
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2298,8 -1786,6 +2298,8 @@@ msgstr "建立‘%s’时发生错误�
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "无效的列表选项\n"
@@@ -2336,255 -1816,199 +2336,255 @@@ msgstr "建立‘%s’时发生错误�
msgid "No fingerprint"
msgstr "CA 指纹："
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "加密数据"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "列出密钥"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "列出密钥和签名"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "导出密钥"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "把密钥导出到某个公钥服务器上"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "从公钥服务器上导入密钥"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "在公钥服务器上搜寻密钥"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "导入/合并密钥"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "打印卡状态"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "更改卡上的数据"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "更新信任度数据库"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "不做任何改变"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2592,7 -2016,6 +2592,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2622,13 -2045,11 +2622,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2643,7 -2064,6 +2643,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2651,80 -2071,65 +2651,80 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, fuzzy, c-format
#| msgid "no = sign found in group definition `%s'\n"
msgid "no = sign found in group definition '%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, fuzzy, c-format
#| msgid "WARNING: unsafe ownership on extension `%s'\n"
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, fuzzy, c-format
#| msgid "WARNING: unsafe permissions on extension `%s'\n"
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2732,19 -2137,16 +2732,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2753,456 -2155,358 +2753,456 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 g10/keygen.c:168
#, fuzzy, c-format
msgid "invalid value for option '%s'\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:2241
++#: g10/gpg.c:2244
#, 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:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, 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:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, 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:3052
++#: g10/gpg.c:3055
#, fuzzy, c-format
msgid "\"%s\" is not a proper mail address\n"
msgstr "电子邮件地址无效\n"
- #: g10/gpg.c:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, 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:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3744
++#: g10/gpg.c:3747
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
#, 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:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, 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:3860
++#: g10/gpg.c:3863
#, 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:3865
++#: g10/gpg.c:3868
#, 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:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, 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:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/gpg.c:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -3772,8 -2965,6 +3772,8 @@@ msgstr "[吊销]
msgid "[self-signature]"
msgstr "[自身签名]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
@@@ -4536,14 -3567,9 +4536,14 @@@ msgid "
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "已吊销"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "已过期"
@@@ -5489,13 -4336,11 +5489,13 @@@ msgstr "密钥指纹 =
msgid " Card serial no. ="
msgstr "卡序列号 ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "缓存钥匙环‘%s’\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5503,14 -4348,12 +5503,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
msgstr[1] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
- #: g10/keyring.c:1552
++#: g10/keyring.c:1557
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5518,7 -4361,6 +5518,7 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 个损坏的签名\n"
msgstr[1] "1 个损坏的签名\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s：钥匙环已建立\n"
@@@ -5611,7 -4434,6 +5611,7 @@@ msgstr "下载密钥 %s，从 %s\n
msgid "no keyserver known\n"
msgstr "公钥服务器无动作！\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过：%s\n"
@@@ -5912,126 -4673,92 +5912,114 @@@ msgstr "读取‘%s’错误：%s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d：不建议使用该选项“%s”\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, fuzzy, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "未压缩|无"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "有歧义的选项‘%s’\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
#, fuzzy
#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "DSA 需要散列值长度为 8 位的倍数\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "文件‘%s’已存在。 "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "是否覆盖？(y/N)"
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s：未知的后缀名\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "请输入新的文件名"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "正在写入到标准输出\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "假定被签名的数据是‘%s’\n"
- #: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
- msgid "new configuration file '%s' created\n"
- msgstr "新的配置文件‘%s’已建立\n"
-
- #: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "无法操作公钥算法 %d\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告：潜在不安全的对称加密会话密钥\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
@@@ -6818,20 -5396,16 +6806,20 @@@ msgstr "正在签名：
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过：重复\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
@@@ -6919,7 -5477,6 +6907,7 @@@ msgstr "信任度数据库处理量过�
msgid "%s: directory does not exist!\n"
msgstr "%s：目录不存在！\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
@@@ -7063,10 -5592,6 +7051,10 @@@ msgstr "生成密码的时候发生错�
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -7098,7 -5618,6 +7086,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -7127,59 -5642,46 +7115,55 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "列出密钥和用户标识"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性：%s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出密钥"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
@@@ -7187,68 -5689,58 +7171,68 @@@ msgid_plural "Encrypted %d messages.
msgstr[0] "以 %lu 个密码加密\n"
msgstr[1] "以 %lu 个密码加密\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
msgid "Messages encrypted in the past: %d."
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
@@@ -7256,149 -5748,123 +7240,149 @@@
#. 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
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
msgid "resetting keydb: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, fuzzy, c-format
msgid "error setting TOFU binding's policy to %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "已经删除了 %d 个签名。\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "以 %lu 个密码加密\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "有效性：%s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7415,18 -5881,14 +7399,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9606,8 -7623,6 +9590,8 @@@ msgstr "
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: 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"
diff --cc po/zh_TW.po
index 18f50b6,637ec29..03abf4d
--- 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-04-03 21:03+0200\n"
++"POT-Creation-Date: 2017-05-15 16:15+0200\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"
@@@ -117,8 -99,6 +117,8 @@@ msgstr "
msgid "Passphrase:"
msgstr "密語:"
- #: agent/call-pinentry.c:1056 agent/command-ssh.c:3108 agent/genkey.c:416
++#: agent/call-pinentry.c:1056 agent/command-ssh.c:3100 agent/genkey.c:416
+#: tools/symcryptrun.c:451
msgid "does not match - try again"
msgstr "前後不一致 - 請再試一次"
@@@ -158,62 -130,39 +158,62 @@@ msgstr "不良的個人識別碼 (PIN)
msgid "Bad Passphrase"
msgstr "不良的密語"
- #: agent/command-ssh.c:642 agent/command-ssh.c:737
++#: agent/command-ssh.c:642 agent/command-ssh.c:731
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
- #: agent/command-ssh.c:845 common/dotlock.c:839 g10/card-util.c:904
- #: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1308 g10/keygen.c:4599
- #: g10/keyring.c:1314 g10/keyring.c:1626 g10/openfile.c:297 g10/openfile.c:424
- #: g10/sign.c:853 g10/sign.c:1156 g10/tdbio.c:716
++#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:904
++#: g10/exec.c:484 g10/export.c:1264 g10/gpg.c:1311 g10/keygen.c:4599
++#: g10/keyring.c:1319 g10/keyring.c:1631 g10/openfile.c:291 g10/sign.c:853
++#: g10/sign.c:1156 g10/tdbio.c:716
#, c-format
msgid "can't create '%s': %s\n"
msgstr "無法建立 '%s': %s\n"
- #: agent/command-ssh.c:857 common/helpfile.c:57 g10/card-util.c:858
++#: agent/command-ssh.c:851 common/helpfile.c:57 g10/card-util.c:858
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1309
++#: g10/decrypt.c:152 g10/encrypt.c:206 g10/encrypt.c:552 g10/gpg.c:1312
+#: g10/import.c:319 g10/import.c:462 g10/import.c:636 g10/keygen.c:3671
- #: g10/keyring.c:1652 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:127 g10/plaintext.c:648 g10/sign.c:835 g10/sign.c:1035
+#: g10/sign.c:1140 g10/sign.c:1285 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/tdbio.c:721 g10/tdbio.c:792 g10/verify.c:96 g10/verify.c:160
+#: sm/gpgsm.c:2125 sm/gpgsm.c:2155 sm/gpgsm.c:2193 sm/qualified.c:66
+#: dirmngr/certcache.c:390 dirmngr/certcache.c:467 dirmngr/certcache.c:469
+#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1651
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: agent/command-ssh.c:2404 agent/command-ssh.c:2450 agent/command-ssh.c:2468
- #: agent/command-ssh.c:2621 g10/card-util.c:653 g10/card-util.c:672
++#: agent/command-ssh.c:2398 agent/command-ssh.c:2444 agent/command-ssh.c:2462
++#: agent/command-ssh.c:2614 g10/card-util.c:653 g10/card-util.c:672
#, c-format
msgid "error getting serial number of card: %s\n"
msgstr "取得此卡片序號時出錯: %s\n"
- #: agent/command-ssh.c:2454
++#: agent/command-ssh.c:2448
#, c-format
msgid "detected card with S/N: %s\n"
msgstr "偵測到卡片, 其序號為: %s\n"
- #: agent/command-ssh.c:2459
++#: 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:2479
++#: agent/command-ssh.c:2473
#, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到合適的卡片金鑰: %s\n"
- #: agent/command-ssh.c:2607
++#: agent/command-ssh.c:2600
#, 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:2781
++#: agent/command-ssh.c:2774
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -221,24 -170,19 +221,24 @@@
msgstr ""
"有某個 ssh 程序提出使用金鑰 %%0A %s%%0A (%s)%%0A 之請求, 請問是否允許?"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Allow"
msgstr "允許"
- #: agent/command-ssh.c:2788
++#: agent/command-ssh.c:2781
msgid "Deny"
msgstr "拒絕"
- #: agent/command-ssh.c:2797
++#: agent/command-ssh.c:2790
#, 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:3036 agent/genkey.c:351
++#: agent/command-ssh.c:3028 agent/genkey.c:351
msgid "Please re-enter this passphrase"
msgstr "請再次輸入密語"
- #: agent/command-ssh.c:3063
++#: agent/command-ssh.c:3055
#, c-format
msgid ""
"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@@ -246,7 -190,6 +246,7 @@@
msgstr ""
"請輸入密語以保護收到的私鑰 %%0A %s%%0A %s%%0A 於 gpg-agent 的金鑰存放處"
- #: agent/command-ssh.c:3641
++#: agent/command-ssh.c:3635
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "從 socket 建立串流失敗: %s\n"
@@@ -399,10 -311,6 +399,10 @@@ msgstr "以伺服器模式執行 (前�
msgid "run in supervised mode"
msgstr "以伺服器模式執行"
- #: agent/gpg-agent.c:157 g10/gpg.c:589 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:157 g10/gpg.c:592 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:303 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:174 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:99 tools/symcryptrun.c:178
msgid "verbose"
msgstr "囉唆模式"
@@@ -504,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:485 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:1027 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
++#: g10/gpg.c:1030 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:278
+#: sm/gpgsm.c:556 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:381
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:124 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
@@@ -524,33 -400,22 +524,33 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:541 g10/gpg.c:1218 scd/scdaemon.c:350 sm/gpgsm.c:704
++#: agent/gpg-agent.c:541 g10/gpg.c:1221 scd/scdaemon.c:350 sm/gpgsm.c:704
+#: dirmngr/dirmngr.c:465
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:1093 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1037
++#: agent/gpg-agent.c:1093 g10/gpg.c:2515 scd/scdaemon.c:503 sm/gpgsm.c:1037
+#: dirmngr/dirmngr.c:896
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2516
++#: agent/gpg-agent.c:1104 agent/gpg-agent.c:1956 g10/gpg.c:2519
+#: scd/scdaemon.c:508 sm/gpgsm.c:1041 dirmngr/dirmngr.c:901
+#: dirmngr/dirmngr.c:1757 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:1112 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1048
++#: agent/gpg-agent.c:1112 g10/gpg.c:2526 scd/scdaemon.c:516 sm/gpgsm.c:1048
+#: dirmngr/dirmngr.c:909
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1234 g10/gpg.c:3662 scd/scdaemon.c:635 sm/gpgsm.c:1531
++#: agent/gpg-agent.c:1234 g10/gpg.c:3665 scd/scdaemon.c:635 sm/gpgsm.c:1531
+#: dirmngr/dirmngr.c:1013 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:529
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
@@@ -595,14 -451,10 +595,14 @@@ msgstr "listen() 失敗: %s\n
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
+#: agent/gpg-agent.c:2212 agent/gpg-agent.c:2255 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
++#: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "無法建立目錄 '%s': %s\n"
- #: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:103
++#: agent/gpg-agent.c:2215 agent/gpg-agent.c:2260 g10/openfile.c:398
++#: g10/openfile.c:418 sm/keydb.c:103
#, c-format
msgid "directory '%s' created\n"
msgstr "目錄 '%s' 已建立\n"
@@@ -642,18 -487,14 +642,18 @@@ 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:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2163
++#: agent/gpg-agent.c:2902 scd/scdaemon.c:1334 dirmngr/dirmngr.c:2162
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:2975 scd/scdaemon.c:1386
++#: agent/gpg-agent.c:2974 scd/scdaemon.c:1386
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:3113 common/simple-pwquery.c:247 g10/call-agent.c:249
++#: agent/gpg-agent.c:3112 common/simple-pwquery.c:247 g10/call-agent.c:249
+#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -669,8 -508,6 +669,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: agent/protect-tool.c:106 g10/gpg.c:425 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: agent/protect-tool.c:106 g10/gpg.c:428 kbx/kbxutil.c:71 sm/gpgsm.c:198
+#: dirmngr/dirmngr.c:157 tools/gpgconf.c:71
msgid ""
"@Commands:\n"
" "
@@@ -678,9 -515,6 +678,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:534 g10/gpgv.c:74 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:537 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:246 dirmngr/dirmngr.c:172 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:96 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -792,8 -607,6 +792,8 @@@ msgstr "請問你是否徹底信任%%0
msgid "Yes"
msgstr "Yes"
- #: agent/trustlist.c:673 agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/trustlist.c:673 agent/findkey.c:1514 agent/findkey.c:1528
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -843,7 -649,6 +843,7 @@@ msgstr "更改密語
msgid "I'll change it later"
msgstr "我稍後再變更"
- #: agent/findkey.c:1492
++#: agent/findkey.c:1490
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -851,11 -656,9 +851,11 @@@
"%%0A?"
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: agent/findkey.c:1516 agent/findkey.c:1530
++#: agent/findkey.c:1514 agent/findkey.c:1528
msgid "Delete key"
msgstr "刪除金鑰"
- #: agent/findkey.c:1527
++#: agent/findkey.c:1525
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -1661,8 -1277,6 +1661,8 @@@ msgstr "錯誤: URL 太長 (上限是 %
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
- #: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2402
++#: g10/card-util.c:910 g10/decrypt-data.c:244 g10/export.c:2399
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
@@@ -1945,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:4949 g10/keyring.c:399 g10/keyring.c:742
++#: g10/decrypt.c:246 g10/gpg.c:4952 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
+#: g10/delkey.c:79 g10/export.c:1886 g10/export.c:2162 g10/export.c:2283
- #: g10/getkey.c:502 g10/getkey.c:1915 g10/gpg.c:4899 g10/keyedit.c:2055
++#: g10/getkey.c:502 g10/getkey.c:1916 g10/gpg.c:4902 g10/keyedit.c:2055
+#: g10/keyedit.c:2932 g10/keyedit.c:3174 g10/keyedit.c:4796 g10/keylist.c:660
- #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2163
++#: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2167
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
- #: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1923 g10/getkey.c:4258
- #: g10/gpg.c:4907 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:646 g10/tofu.c:2171
++#: g10/delkey.c:88 g10/export.c:1954 g10/getkey.c:1924 g10/getkey.c:4259
++#: g10/gpg.c:4910 g10/keyedit.c:2905 g10/keyserver.c:1262 g10/revoke.c:236
++#: g10/revoke.c:646 g10/tofu.c:2175
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
@@@ -2173,8 -1670,6 +2173,8 @@@ msgstr "
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1268 g10/import.c:1608 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:857 g10/sign.c:1160
#, c-format
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
@@@ -2197,8 -1688,6 +2197,8 @@@ msgstr "金鑰 %s: PGP 2.x 型態的金
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/export.c:2366 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2364 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"
@@@ -2207,8 -1695,6 +2207,8 @@@
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1895
++#: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1896
+#: g10/pkclist.c:989
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
@@@ -2245,241 -1725,185 +2245,241 @@@ msgstr "取得 '%s' (經由 %s ) 時出
msgid "No fingerprint"
msgstr "沒有指紋"
- #: g10/getkey.c:1892 g10/revoke.c:638 g10/revoke.c:703
++#: g10/getkey.c:1893 g10/revoke.c:638 g10/revoke.c:703
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私鑰 \"%s\": %s\n"
- #: g10/getkey.c:1975
++#: g10/getkey.c:1976
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:1983
++#: g10/getkey.c:1984
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:1990
++#: g10/getkey.c:1991
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2801
++#: g10/getkey.c:2802
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:3636
++#: g10/getkey.c:3637
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:427 sm/gpgsm.c:200
++#: g10/gpg.c:430 sm/gpgsm.c:200
msgid "make a signature"
msgstr "建立簽章"
- #: g10/gpg.c:428
++#: g10/gpg.c:431
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:430 sm/gpgsm.c:202
++#: g10/gpg.c:433 sm/gpgsm.c:202
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:431 sm/gpgsm.c:203
++#: g10/gpg.c:434 sm/gpgsm.c:203
msgid "encrypt data"
msgstr "加密資料"
- #: g10/gpg.c:433
++#: g10/gpg.c:436
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:435 sm/gpgsm.c:205
++#: g10/gpg.c:438 sm/gpgsm.c:205
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:437 sm/gpgsm.c:206
++#: g10/gpg.c:440 sm/gpgsm.c:206
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:439 sm/gpgsm.c:207
++#: g10/gpg.c:442 sm/gpgsm.c:207
msgid "list keys"
msgstr "列出金鑰"
- #: g10/gpg.c:441
++#: g10/gpg.c:444
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
- #: g10/gpg.c:444
++#: g10/gpg.c:447
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:446 sm/gpgsm.c:212
++#: g10/gpg.c:449 sm/gpgsm.c:212
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:447 sm/gpgsm.c:210
++#: g10/gpg.c:450 sm/gpgsm.c:210
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:449 sm/gpgsm.c:213
++#: g10/gpg.c:452 sm/gpgsm.c:213
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
- #: g10/gpg.c:452
++#: g10/gpg.c:455
msgid "quickly generate a new key pair"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:455
++#: g10/gpg.c:458
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:460
++#: g10/gpg.c:463
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly revoke a user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:463
++#: g10/gpg.c:466
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:466
++#: g10/gpg.c:469
msgid "full featured key pair generation"
msgstr "全能金鑰對生成"
- #: g10/gpg.c:469
++#: g10/gpg.c:472
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:472 sm/gpgsm.c:216
++#: g10/gpg.c:475 sm/gpgsm.c:216
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:474
++#: g10/gpg.c:477
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:476
++#: g10/gpg.c:479
msgid "quickly sign a key"
msgstr "快速簽署金鑰"
- #: g10/gpg.c:478
++#: g10/gpg.c:481
msgid "quickly sign a key locally"
msgstr "快速在本機簽署金鑰"
- #: g10/gpg.c:479
++#: g10/gpg.c:482
msgid "sign a key"
msgstr "簽署金鑰"
- #: g10/gpg.c:480
++#: g10/gpg.c:483
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
- #: g10/gpg.c:481
++#: g10/gpg.c:484
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:483 sm/gpgsm.c:234
++#: g10/gpg.c:486 sm/gpgsm.c:234
msgid "change a passphrase"
msgstr "更改密語"
- #: g10/gpg.c:487
++#: g10/gpg.c:490
msgid "export keys"
msgstr "匯出金鑰"
- #: g10/gpg.c:488
++#: g10/gpg.c:491
msgid "export keys to a keyserver"
msgstr "把金鑰匯出至金鑰伺服器"
- #: g10/gpg.c:489
++#: g10/gpg.c:492
msgid "import keys from a keyserver"
msgstr "從金鑰伺服器匯入金鑰"
- #: g10/gpg.c:492
++#: g10/gpg.c:495
msgid "search for keys on a keyserver"
msgstr "在金鑰伺服器上搜尋金鑰"
- #: g10/gpg.c:494
++#: g10/gpg.c:497
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
- #: g10/gpg.c:500
++#: g10/gpg.c:503
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
- #: g10/gpg.c:503
++#: g10/gpg.c:506
msgid "print the card status"
msgstr "列印卡片狀態"
- #: g10/gpg.c:504
++#: g10/gpg.c:507
msgid "change data on a card"
msgstr "變更卡片上的資料"
- #: g10/gpg.c:506
++#: g10/gpg.c:509
msgid "change a card's PIN"
msgstr "變更卡片的個人識別碼 (PIN)"
- #: g10/gpg.c:518
++#: g10/gpg.c:521
msgid "update the trust database"
msgstr "更新信任資料庫"
- #: g10/gpg.c:527
++#: g10/gpg.c:530
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:530 sm/gpgsm.c:229
++#: g10/gpg.c:533 sm/gpgsm.c:229
msgid "run in server mode"
msgstr "以伺服器模式執行"
- #: g10/gpg.c:532
++#: g10/gpg.c:535
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:536 sm/gpgsm.c:248
++#: g10/gpg.c:539 sm/gpgsm.c:248
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:539 sm/gpgsm.c:264
++#: g10/gpg.c:542 sm/gpgsm.c:264
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:555 sm/gpgsm.c:300
++#: g10/gpg.c:558 sm/gpgsm.c:300
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
- #: g10/gpg.c:561
++#: g10/gpg.c:564
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
- #: g10/gpg.c:568
++#: g10/gpg.c:571
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:585 g10/gpgv.c:80 sm/gpgsm.c:302
++#: g10/gpg.c:588 g10/gpgv.c:80 sm/gpgsm.c:302
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:600 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
++#: g10/gpg.c:603 kbx/kbxutil.c:90 sm/gpgsm.c:314 tools/gpgconf.c:101
msgid "do not make any changes"
msgstr "不要做任何改變"
- #: g10/gpg.c:601
++#: g10/gpg.c:604
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
- #: g10/gpg.c:650
++#: g10/gpg.c:653
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:676 sm/gpgsm.c:357
++#: g10/gpg.c:679 sm/gpgsm.c:357
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2487,7 -1911,6 +2487,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:679
++#: g10/gpg.c:682
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -2517,11 -1940,9 +2517,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:1049
++#: g10/gpg.c:1052
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:1052
++#: g10/gpg.c:1055
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2531,7 -1952,6 +2531,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1063 sm/gpgsm.c:580
++#: g10/gpg.c:1066 sm/gpgsm.c:580
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2539,531 -1959,415 +2539,531 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:1066
++#: g10/gpg.c:1069
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:1073 g10/keyedit.c:3566
++#: g10/gpg.c:1076 g10/keyedit.c:3566
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:1080
++#: g10/gpg.c:1083
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1087 g10/keyedit.c:3615
++#: g10/gpg.c:1090 g10/keyedit.c:3615
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1156 sm/gpgsm.c:654
++#: g10/gpg.c:1159 sm/gpgsm.c:654
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1344 sm/gpgsm.c:743
++#: g10/gpg.c:1347 sm/gpgsm.c:743
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1362
++#: g10/gpg.c:1365
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1560
++#: g10/gpg.c:1563
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1563
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1569
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1575
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1575
++#: g10/gpg.c:1578
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1581
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1587
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1587
++#: g10/gpg.c:1590
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1590
++#: g10/gpg.c:1593
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1596
++#: g10/gpg.c:1599
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1599
++#: g10/gpg.c:1602
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1602
++#: g10/gpg.c:1605
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1818
++#: g10/gpg.c:1821
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1929
++#: g10/gpg.c:1932
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1931
++#: g10/gpg.c:1934
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1933
++#: g10/gpg.c:1936
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1935
++#: g10/gpg.c:1938
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1937
++#: g10/gpg.c:1940
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1941
++#: g10/gpg.c:1944
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1943
++#: g10/gpg.c:1946
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1945
++#: g10/gpg.c:1948
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1947
++#: g10/gpg.c:1950
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1949
++#: g10/gpg.c:1952
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1951
++#: g10/gpg.c:1954
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1953
++#: g10/gpg.c:1956
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:2055 g10/gpg.c:2092
++#: g10/gpg.c:2058 g10/gpg.c:2095
#, fuzzy, c-format
#| msgid "invalid argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
msgstr "選項 \"%.50s\" 的引數無效\n"
- #: g10/gpg.c:2066
++#: g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/gpg.c:2068 g10/gpg.c:2104
++#: g10/gpg.c:2071 g10/gpg.c:2107
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2102 g10/keygen.c:168
++#: g10/gpg.c:2105 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:2241
++#: g10/gpg.c:2244
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2846 g10/gpg.c:3629 g10/gpg.c:3641
++#: g10/gpg.c:2849 g10/gpg.c:3632 g10/gpg.c:3644
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:3018 g10/gpg.c:3030
++#: g10/gpg.c:3021 g10/gpg.c:3033
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3055
#, 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:3084 sm/gpgsm.c:1158
++#: g10/gpg.c:3087 sm/gpgsm.c:1158
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3142
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:3161 g10/gpg.c:3366 g10/keyedit.c:5526
++#: g10/gpg.c:3164 g10/gpg.c:3369 g10/keyedit.c:5526
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:3179
++#: g10/gpg.c:3182
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3182
++#: g10/gpg.c:3185
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3189
++#: g10/gpg.c:3192
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:3192
++#: g10/gpg.c:3195
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:3198 g10/gpg.c:3213
++#: g10/gpg.c:3201 g10/gpg.c:3216
#, fuzzy, c-format
#| msgid "invalid list options\n"
msgid "invalid filter option: %s\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3204
++#: g10/gpg.c:3207
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:3207
++#: g10/gpg.c:3210
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:3219
++#: g10/gpg.c:3222
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:3222
++#: g10/gpg.c:3225
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3230
++#: g10/gpg.c:3233
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:3232
++#: g10/gpg.c:3235
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:3234
++#: g10/gpg.c:3237
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:3236
++#: g10/gpg.c:3239
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:3240
++#: g10/gpg.c:3243
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:3242
++#: g10/gpg.c:3245
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:3244
++#: g10/gpg.c:3247
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:3246
++#: g10/gpg.c:3249
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3251
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:3250
++#: g10/gpg.c:3253
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:3252
++#: g10/gpg.c:3255
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:3259
++#: g10/gpg.c:3262
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:3262
++#: g10/gpg.c:3265
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:3269
++#: g10/gpg.c:3272
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3461
++#: g10/gpg.c:3464
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3467
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3611 sm/gpgsm.c:1501
++#: g10/gpg.c:3614 sm/gpgsm.c:1501
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3622
++#: g10/gpg.c:3625
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3634
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3634
++#: g10/gpg.c:3637
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3649 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
++#: g10/gpg.c:3652 sm/gpgsm.c:1518 dirmngr/dirmngr.c:1028
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3670
++#: g10/gpg.c:3673
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3705 g10/gpg.c:3729 sm/gpgsm.c:1585
++#: g10/gpg.c:3708 g10/gpg.c:3732 sm/gpgsm.c:1585
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3711 g10/gpg.c:3735 sm/gpgsm.c:1591 sm/gpgsm.c:1597
++#: g10/gpg.c:3714 g10/gpg.c:3738 sm/gpgsm.c:1591 sm/gpgsm.c:1597
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3717
++#: g10/gpg.c:3720
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3723
++#: g10/gpg.c:3726
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3738
++#: g10/gpg.c:3741
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3743
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3742
++#: g10/gpg.c:3745
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3744
++#: g10/gpg.c:3747
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:3746
++#: g10/gpg.c:3749
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3749
++#: g10/gpg.c:3752
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3753
++#: g10/gpg.c:3756
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3760
++#: g10/gpg.c:3763
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3764
++#: g10/gpg.c:3767
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3768
++#: g10/gpg.c:3771
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3772
++#: g10/gpg.c:3775
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3811
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3855
++#: g10/gpg.c:3858
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
- #: g10/gpg.c:3860
++#: g10/gpg.c:3863
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3865
++#: g10/gpg.c:3868
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3969
++#: g10/gpg.c:3972
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3981
++#: g10/gpg.c:3984
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:4053
++#: g10/gpg.c:4056
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:4082
++#: g10/gpg.c:4085
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:4085
++#: g10/gpg.c:4088
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:4142
++#: g10/gpg.c:4145
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4145
++#: g10/gpg.c:4148
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:4500 g10/keyserver.c:1839
++#: g10/gpg.c:4503 g10/keyserver.c:1839
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4505
++#: g10/gpg.c:4508
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4511
++#: g10/gpg.c:4514
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4524
++#: g10/gpg.c:4527
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4536
++#: g10/gpg.c:4539
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4552
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4616
++#: g10/gpg.c:4619
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4627
++#: g10/gpg.c:4630
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4719
++#: g10/gpg.c:4722
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4868 g10/tofu.c:2151
++#: g10/gpg.c:4871 g10/tofu.c:2155
#, 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:4880
++#: g10/gpg.c:4883
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4928
++#: g10/gpg.c:4931
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
msgstr ""
- #: g10/gpg.c:4939
++#: g10/gpg.c:4942
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:5278
++#: g10/gpg.c:5281
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:5280
++#: g10/gpg.c:5283
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:5313
++#: g10/gpg.c:5316
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -3626,8 -2819,6 +3626,8 @@@ msgstr "[撤銷]
msgid "[self-signature]"
msgstr "[自我簽章]"
- #: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:677
++#: g10/keyedit.c:437 dirmngr/ldap-wrapper-ce.c:392 dirmngr/ldap-wrapper.c:677
+#: dirmngr/ldap-wrapper.c:694
#, c-format
msgid "error allocating memory: %s\n"
msgstr "配置記憶體時出錯: %s\n"
@@@ -4381,14 -3412,9 +4381,14 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
+#: g10/keyedit.c:4233 g10/keyedit.c:4664 g10/keyserver.c:548
- #: g10/mainproc.c:2063 g10/tofu.c:1784 g10/trust.c:417 g10/trust.c:727
++#: g10/mainproc.c:2063 g10/tofu.c:1788 g10/trust.c:417 g10/trust.c:727
+#: dirmngr/ocsp.c:705
msgid "revoked"
msgstr "已撤銷"
+#: g10/keyedit.c:4235 g10/keyedit.c:4666 g10/keyserver.c:552
- #: g10/mainproc.c:2065 g10/tofu.c:1789 g10/trust.c:104 g10/trust.c:729
++#: g10/mainproc.c:2065 g10/tofu.c:1793 g10/trust.c:104 g10/trust.c:729
msgid "expired"
msgstr "已過期"
@@@ -5307,33 -4154,28 +5307,33 @@@ msgstr " 金鑰指紋 =
msgid " Card serial no. ="
msgstr " 卡片序號 ="
- #: g10/keyring.c:1462
++#: g10/keyring.c:1467
#, c-format
msgid "caching keyring '%s'\n"
msgstr "快取鑰匙圈 '%s' 中\n"
- #: g10/keyring.c:1536
++#: g10/keyring.c:1541
#, 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:1552
++#: g10/keyring.c:1557
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "清除快取"
- #: g10/keyring.c:1554
++#: g10/keyring.c:1559
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] "1 份損壞的簽章\n"
- #: g10/keyring.c:1630
++#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鑰匙圈已建立\n"
@@@ -5425,7 -4248,6 +5425,7 @@@ msgstr "正在請求金鑰 %s 自 %s\n
msgid "no keyserver known\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/keyserver.c:1826 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1826 g10/skclist.c:222 g10/skclist.c:250
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "已跳過 \"%s\": %s\n"
@@@ -5717,118 -4478,86 +5717,108 @@@ msgstr "'%s' 讀取錯誤: %s\n
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1144
++#: g10/misc.c:1147
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
- #: g10/misc.c:1148
++#: g10/misc.c:1151
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告: 已不建議使用 \"%s\" 選項\n"
- #: g10/misc.c:1150
++#: g10/misc.c:1153
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "請改以 \"%s%s\" 代替\n"
- #: g10/misc.c:1157
++#: g10/misc.c:1160
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
- #: g10/misc.c:1167
++#: g10/misc.c:1170
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
- #: g10/misc.c:1171
++#: g10/misc.c:1174
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
- #: g10/misc.c:1235
++#: g10/misc.c:1238
msgid "Uncompressed"
msgstr "未壓縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1260
++#: g10/misc.c:1263
msgid "uncompressed|none"
msgstr "uncompressed|none|未壓縮|無"
- #: g10/misc.c:1385
++#: g10/misc.c:1388
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "這個訊息對 %s 來說無法使用\n"
- #: g10/misc.c:1560
++#: g10/misc.c:1563
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "不明確的選項 '%s'\n"
- #: g10/misc.c:1585
++#: g10/misc.c:1588
#, c-format
msgid "unknown option '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/misc.c:1823
++#: g10/misc.c:1826
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
- #: g10/misc.c:1845
++#: g10/misc.c:1848
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/openfile.c:84
++#: g10/openfile.c:78
#, c-format
msgid "File '%s' exists. "
msgstr "檔案 '%s' 已存在. "
- #: g10/openfile.c:88
++#: g10/openfile.c:82
msgid "Overwrite? (y/N) "
msgstr "是否覆寫? (y/N) "
- #: g10/openfile.c:123
++#: g10/openfile.c:117
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: 未知的副檔名\n"
- #: g10/openfile.c:147
++#: g10/openfile.c:141
msgid "Enter new filename"
msgstr "請輸入新的檔名"
- #: g10/openfile.c:218
++#: g10/openfile.c:212
msgid "writing to stdout\n"
msgstr "寫到標準輸出中\n"
- #: g10/openfile.c:366
++#: g10/openfile.c:360
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "假設被簽署的資料在 '%s'\n"
- #: g10/openfile.c:457
- #, c-format
- msgid "new configuration file '%s' created\n"
- msgstr "新的組態檔案 '%s' 已建立\n"
-
- #: g10/openfile.c:498
- #, c-format
- msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
-
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "無法操作 %d 公開金鑰演算法\n"
- #: g10/parse-packet.c:1184
++#: g10/parse-packet.c:1187
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
- #: g10/parse-packet.c:1721
++#: g10/parse-packet.c:1724
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
@@@ -6622,20 -5202,16 +6612,20 @@@ msgstr "簽署:
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
- #: g10/skclist.c:155 g10/skclist.c:236
++#: g10/skclist.c:181 g10/skclist.c:262
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
- #: g10/skclist.c:187
++#: g10/skclist.c:213
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "已跳過 \"%s\": 重複了\n"
- #: g10/skclist.c:206
++#: g10/skclist.c:232
msgid "skipped: secret key already present\n"
msgstr "已跳過: 私鑰已經存在\n"
- #: g10/skclist.c:225
++#: g10/skclist.c:251
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
@@@ -6718,7 -5278,6 +6708,7 @@@ msgstr "信任資料庫更動量過大\
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:704 dirmngr/http.c:584
++#: g10/tdbio.c:704 dirmngr/http.c:585
#, c-format
msgid "can't access '%s': %s\n"
msgstr "無法存取 '%s': %s\n"
@@@ -6859,10 -5390,6 +6849,10 @@@ msgstr "建立暫存檔時出錯: %s\n
msgid "TOFU DB error"
msgstr ""
- #: g10/tofu.c:688 g10/tofu.c:2070 g10/tofu.c:2349 g10/tofu.c:2368
- #: g10/tofu.c:2381 g10/tofu.c:2393 g10/tofu.c:2408 g10/tofu.c:2420
- #: g10/tofu.c:3016 g10/tofu.c:3033 g10/tofu.c:3070 g10/tofu.c:3087
- #: g10/tofu.c:3391
++#: g10/tofu.c:688 g10/tofu.c:2074 g10/tofu.c:2353 g10/tofu.c:2372
++#: g10/tofu.c:2385 g10/tofu.c:2397 g10/tofu.c:2412 g10/tofu.c:2424
++#: g10/tofu.c:3020 g10/tofu.c:3037 g10/tofu.c:3074 g10/tofu.c:3091
++#: g10/tofu.c:3401
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -6897,7 -5419,6 +6887,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/tofu.c:1149 g10/tofu.c:3445 g10/tofu.c:3583
++#: g10/tofu.c:1149 g10/tofu.c:3455 g10/tofu.c:3593
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -6926,121 -5443,98 +6916,117 @@@ msgid "
"or whether you think someone is impersonating \"%s\"."
msgstr ""
- #: g10/tofu.c:1605
++#: g10/tofu.c:1609
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "取得回應程式 ID 時出錯: %s\n"
- #: g10/tofu.c:1615
++#: g10/tofu.c:1619
#, fuzzy
#| msgid "list key and user IDs"
msgid "This key's user IDs:\n"
msgstr "列出金鑰和使用者 ID"
- #: g10/tofu.c:1631 g10/tofu.c:1796
++#: g10/tofu.c:1635 g10/tofu.c:1800
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性: %s"
- #: g10/tofu.c:1722
++#: g10/tofu.c:1726
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "取得已存放的旗標時出錯: %s\n"
- #: g10/tofu.c:1726
++#: g10/tofu.c:1730
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
- #: g10/tofu.c:1744
++#: g10/tofu.c:1748
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1785 g10/tofu.c:1790
- msgid ", "
- msgstr ""
-
- #: g10/tofu.c:1794
++#: g10/tofu.c:1798
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出金鑰"
- #: g10/tofu.c:1820
++#: g10/tofu.c:1824
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message."
msgid_plural "Verified %d messages."
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:1824
++#: g10/tofu.c:1828
#, fuzzy, c-format
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
msgstr[0] "已用 %lu 個密語加密了\n"
- #: g10/tofu.c:1831
++#: g10/tofu.c:1835
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:1835
++#: g10/tofu.c:1839
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:1849
++#: g10/tofu.c:1853
#, c-format
msgid "Messages verified over the past %d day: %d."
msgid_plural "Messages verified over the past %d days: %d."
msgstr[0] ""
- #: g10/tofu.c:1855
++#: g10/tofu.c:1859
#, c-format
msgid "Messages encrypted over the past %d day: %d."
msgid_plural "Messages encrypted over the past %d days: %d."
msgstr[0] ""
- #: g10/tofu.c:1865
++#: g10/tofu.c:1869
#, c-format
msgid "Messages verified over the past %d month: %d."
msgid_plural "Messages verified over the past %d months: %d."
msgstr[0] ""
- #: g10/tofu.c:1871
++#: g10/tofu.c:1875
#, c-format
msgid "Messages encrypted over the past %d month: %d."
msgid_plural "Messages encrypted over the past %d months: %d."
msgstr[0] ""
- #: g10/tofu.c:1881
++#: g10/tofu.c:1885
#, c-format
msgid "Messages verified over the past %d year: %d."
msgid_plural "Messages verified over the past %d years: %d."
msgstr[0] ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1891
#, c-format
msgid "Messages encrypted over the past %d year: %d."
msgid_plural "Messages encrypted over the past %d years: %d."
msgstr[0] ""
- #: g10/tofu.c:1895
++#: g10/tofu.c:1899
#, c-format
msgid "Messages verified in the past: %d."
msgstr ""
- #: g10/tofu.c:1899
++#: g10/tofu.c:1903
#, fuzzy, c-format
#| msgid "print message digests"
msgid "Messages encrypted in the past: %d."
@@@ -7049,145 -5543,119 +7035,145 @@@ msgstr "印出訊息摘要
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1916
++#: g10/tofu.c:1920
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1958
++#: g10/tofu.c:1962
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:1964
++#: g10/tofu.c:1968
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:1972
++#: g10/tofu.c:1976
msgid "Defaulting to unknown.\n"
msgstr ""
- #: g10/tofu.c:2087 g10/tofu.c:2223
++#: g10/tofu.c:2091 g10/tofu.c:2227
msgid "TOFU db corruption detected.\n"
msgstr ""
- #: g10/tofu.c:2143
++#: g10/tofu.c:2147
#, fuzzy, c-format
#| msgid "error writing key: %s\n"
msgid "resetting keydb: %s\n"
msgstr "寫入金鑰時出錯: %s\n"
- #: g10/tofu.c:2610
++#: g10/tofu.c:2614
#, 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:2823
++#: g10/tofu.c:2827
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "建立管道時出錯: %s\n"
- #: g10/tofu.c:2874
++#: g10/tofu.c:2878
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
msgstr[0] ""
- #: g10/tofu.c:2879
++#: g10/tofu.c:2883
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
msgstr[0] ""
- #: g10/tofu.c:2884
++#: g10/tofu.c:2888
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
msgstr[0] ""
- #: g10/tofu.c:2889
++#: g10/tofu.c:2893
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
msgstr[0] ""
- #: g10/tofu.c:2894
++#: g10/tofu.c:2898
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
msgstr[0] ""
- #: g10/tofu.c:2899
++#: g10/tofu.c:2903
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
msgstr[0] ""
- #: g10/tofu.c:2901
++#: g10/tofu.c:2905
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
msgstr[0] ""
- #: g10/tofu.c:3140
++#: g10/tofu.c:3144
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
msgstr ""
- #: g10/tofu.c:3146
++#: g10/tofu.c:3150
#, fuzzy, c-format
#| msgid "Deleted %d signatures.\n"
msgid "%s: Verified 0 signatures."
msgstr "已經刪除了 %d 份簽章.\n"
- #: g10/tofu.c:3154
++#: g10/tofu.c:3158
#, 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:3164
++#: g10/tofu.c:3168
#, fuzzy
#| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
msgstr "已用 %lu 個密語加密了\n"
- #: g10/tofu.c:3172
++#: g10/tofu.c:3176
#, 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:3183
++#: g10/tofu.c:3187
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "(policy: %s)"
msgstr "有效性: %s"
- #: g10/tofu.c:3214
++#: g10/tofu.c:3221
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3217
++#: g10/tofu.c:3224
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
- #: g10/tofu.c:3221
++#: g10/tofu.c:3228
msgid "Warning: you have yet to encrypt a message to this key!\n"
msgstr ""
- #: g10/tofu.c:3224
++#: g10/tofu.c:3231
msgid "Warning: you have only encrypted one message to this key!\n"
msgstr ""
- #: g10/tofu.c:3253
++#: g10/tofu.c:3260
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7203,19 -5671,15 +7189,19 @@@ msgid_plural "
"to mark it as being bad.\n"
msgstr[0] ""
- #: g10/tofu.c:3335 g10/tofu.c:3487 g10/tofu.c:3689 g10/tofu.c:3733
- #: g10/tofu.c:3872 g10/tofu.c:3947 g10/tofu.c:3983
++#: g10/tofu.c:3345 g10/tofu.c:3497 g10/tofu.c:3699 g10/tofu.c:3743
++#: g10/tofu.c:3882 g10/tofu.c:3957 g10/tofu.c:3993
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:3520
++#: g10/tofu.c:3530
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3907
++#: g10/tofu.c:3917
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -9312,8 -7331,6 +9298,8 @@@ msgstr "正改以 \"http\" 代替 \"htt
msgid "CRL access not possible due to disabled %s\n"
msgstr "不可能存取 CRL 因已停用 %s\n"
- #: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:488
++#: dirmngr/crlfetch.c:227 dirmngr/ldap-wrapper-ce.c:491
+#: dirmngr/ldap-wrapper.c:743 dirmngr/misc.c:573
#, c-format
msgid "error initializing reader object: %s\n"
msgstr "啟始讀取程式物件時出錯: %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